INTEGRATION: CWS hc680pp1 (1.3.34); FILE MERGED

2005/09/30 19:30:41 ufi 1.3.34.3: RESYNC: (1.3-1.4); FILE MERGED
2005/07/20 08:41:14 ufi 1.3.34.2: before build
2005/06/02 09:57:18 fpe 1.3.34.1:  regular update

1 files changed, 15 insertions, 24 deletions

diff --git a/helpcontent2/source/text/shared/explorer/database/30000000.xhp b/helpcontent2/source/text/shared/explorer/database/30000000.xhp
index c73dae1877..79ffb79622 100644
--- a/helpcontent2/source/text/shared/explorer/database/30000000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/30000000.xhp
@@ -5,9 +5,9 @@
  *
  *  $RCSfile: 30000000.xhp,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 22:37:49 $
+ *  last change: $Author: kz $ $Date: 2005-10-05 13:41:24 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -42,7 +42,7 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-07T16:04:37">UFI: fixed #i21955#
+<lastedited date="2005-07-18T11:30:24">UFI: fixed #i21955#
 FPE: Switched for SO only (#i10510#)</lastedited>
 </history>
 </meta>
@@ -59,31 +59,18 @@ FPE: Switched for SO only (#i10510#)</lastedited>
 <paragraph role="paragraph" id="par_id3149378" xml-lang="en-US" l10n="U" oldref="38">Use the <link href="text/shared/explorer/database/30100000.xhp" name="Create New Adabas Database"><emph>Create New Adabas Database</emph></link> dialog to create an Adabas database:</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3147045" xml-lang="en-US" l10n="U" oldref="39">Choose <emph>Tools - Data Sources</emph>, and then click the<emph> General</emph> tab.</paragraph>
+<paragraph role="listitem" id="par_id3147045" xml-lang="en-US" l10n="CHG" oldref="39">Choose <emph>File - New - Database</emph> to open the Database Wizard.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3147394" xml-lang="en-US" l10n="U" oldref="98">Click <emph>New Data Source</emph>, and then select "Adabas" in the <emph>Database type</emph> box.</paragraph>
+<paragraph role="listitem" id="par_id3147394" xml-lang="en-US" l10n="CHG" oldref="98">Click <emph>Connect to an existing database</emph>, and then select "Adabas" in the listbox (scroll up in the listbox).</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3155600" xml-lang="en-US" l10n="U" oldref="99">Click the <emph>New Database</emph> button.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153415" xml-lang="en-US" l10n="U" oldref="40">Type the name of the database in the <emph>Database name </emph>box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156332" xml-lang="en-US" l10n="U" oldref="100">In the <emph>Administrator</emph> box, type the name of the administrator.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147173" xml-lang="en-US" l10n="U" oldref="101">In the same row, click the<emph> Password</emph> button.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147494" xml-lang="en-US" l10n="U" oldref="102">Enter a password, and then click<emph> OK</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3155600" xml-lang="en-US" l10n="CHG" oldref="99">Follow the remaining pages of the Database Wizard.</paragraph>
 </listitem>
 </list>
 <paragraph role="heading" id="hd_id3154270" xml-lang="en-US" level="2" l10n="U" oldref="42">Deleting an Adabas Database</paragraph>
-<paragraph role="paragraph" id="par_id3157869" xml-lang="en-US" l10n="U" oldref="43">To delete the reference to an Adabas database, right-click the name of the database in the data source view, and then choose <emph>Delete Data Source</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3157869" xml-lang="en-US" l10n="CHG" oldref="43">To delete the reference to an Adabas database, choose <emph>Tools - Options - %PRODUCTNAME Base - Databases</emph>. Select the database, and then click <emph>Delete</emph>.</paragraph>
 <paragraph role="heading" id="hd_id3150327" xml-lang="en-US" level="3" l10n="U" oldref="103">To delete an Adabas database:</paragraph>
-<paragraph role="paragraph" id="par_id3148405" xml-lang="en-US" l10n="U" oldref="44">If you do not know the name of the Adabas database that you want to delete, choose <emph>Tools - Data Sources</emph>, click the <emph>General</emph> tab, and look at the <emph>Data Source URL </emph>box.</paragraph>
 <list type="ordered">
 <listitem>
 <paragraph role="listitem" id="par_id3153927" xml-lang="en-US" l10n="U" oldref="45">Determine which directories are referred to by the system variables DBCONFIG and DBWORK. <switchinline select="sys"><caseinline select="WIN">Under Windows these variables are defined in the system settings or in the c:\Autoexec.bat file. 
@@ -142,19 +129,23 @@ FPE: Switched for SO only (#i10510#)</lastedited>
 </caseinline><defaultinline>Adabas\bin</defaultinline></switchinline> directory.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3155141" xml-lang="en-US" l10n="U" oldref="104">Choose <emph>Tools - Data Source</emph>, and then click the <emph>General </emph>tab.</paragraph>
+<paragraph role="listitem" id="par_id3155141" xml-lang="en-US" l10n="CHG" oldref="104">Choose <emph>File - New - Database</emph>.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3166428" xml-lang="en-US" l10n="U" oldref="88">In the <emph>Data source </emph>box, enter the name of the server, a colon, and the name of the database on the server, for example, computername:database.</paragraph>
+<paragraph role="listitem" id="par_id3166428" xml-lang="en-US" l10n="CHG" oldref="88">Click <emph>Connect to an existing database</emph>, and select "Adabas D" in the listbox. Click <emph>Next</emph>.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3155508" xml-lang="en-US" l10n="U" oldref="105">Click the <emph>Adabas D</emph> tab, and then enter a name in the <emph>User Name </emph>box.</paragraph>
+<paragraph role="listitem" id="par_id296334" xml-lang="en-US" l10n="NEW">In the <emph>Name of the Adabas D database </emph>box, enter the name of the server, a colon, and the name of the database on the server, for example, computername:database.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3154816" xml-lang="en-US" l10n="U" oldref="106">Select the <emph>Password</emph> checkbox, and then click <emph>OK</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3155508" xml-lang="en-US" l10n="CHG" oldref="105">Fill in the remaining pages of the Database Wizard.</paragraph>
 </listitem>
 </list>
 </case>
+<default>
+<paragraph role="paragraph" id="par_id842310" xml-lang="en-US" l10n="NEW">Adabas D by Software AG is installed when you install the commercial office software by Sun Microsystems, Inc.</paragraph>
+<paragraph role="paragraph" id="par_id3479720" xml-lang="en-US" l10n="NEW">If you are using OpenOffice.org software, the Adabas D software package can be downloaded and installed separately (see www.adabas.com).</paragraph>
+</default>
 </switch>
 </body>
 </helpdocument>