summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-08-27 13:46:35 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-08-27 13:46:35 +0000
commita106996e28baf186de2b15f959f932bed023ec2c (patch)
tree9ae8d78ecb909ac45111a434438ccd61e5ad84aa
parent7aab184b2969a2338118b5a76e4d861e3726105e (diff)
INTEGRATION: CWS hcshared09 (1.6.56); FILE MERGED
2007/05/09 13:00:31 ufi 1.6.56.1: final commitment
-rw-r--r--helpcontent2/source/text/shared/explorer/database/05030100.xhp76
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp24
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabapropadd.xhp30
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabapropgen.xhp85
4 files changed, 96 insertions, 119 deletions
diff --git a/helpcontent2/source/text/shared/explorer/database/05030100.xhp b/helpcontent2/source/text/shared/explorer/database/05030100.xhp
index f314eeecea..fa879f1b1e 100644
--- a/helpcontent2/source/text/shared/explorer/database/05030100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030100.xhp
@@ -1,69 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
***********************************************************************
*
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
+ * OpenOffice.org - a multi-platform office productivity suite
*
- * - GNU Lesser General Public License Version 2.1
- * - Sun Industry Standards Source License Version 1.1
+ * $RCSfile: 05030100.xhp,v $fileonly,v $
*
- * Sun Microsystems Inc., October, 2000
+ * $Revision: 1.7 $
*
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2000 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ * last change: $Author: vg $ $Date: 2007-08-27 14:45:15 $
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
*
************************************************************************
-->
-
-<helpdocument version="1.0">
+
+
+ <helpdocument version="1.0">
<meta>
<topic id="textsharedexplorerdatabase05030100xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Copy Table</title>
<filename>/text/shared/explorer/database/05030100.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-04-07T13:05:29">FPE: Switched for Adabas in So only (#i10510#)</lastedited>
-</history>
</meta>
<body>
<section id="tabkop">
<paragraph role="heading" id="hd_id3085157" xml-lang="en-US" level="1" l10n="U" oldref="28"><link href="text/shared/explorer/database/05030100.xhp" name="Copy Table">Copy Table</link></paragraph>
<paragraph role="paragraph" id="par_id3149264" xml-lang="en-US" l10n="CHG" oldref="29">You can copy a table by dragging and dropping the table onto the table area of a database file window. The <emph>Copy table </emph>dialog appears.</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/HID_TAB_WIZ_TABLENAME_EDIT" id="bm_id3154840" localize="false"/>
-<paragraph role="heading" id="hd_id3154926" xml-lang="en-US" level="2" l10n="U" oldref="3">Table name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_TAB_WIZ_TABLENAME_EDIT" id="bm_id3154840" localize="false"/><paragraph role="heading" id="hd_id3154926" xml-lang="en-US" level="2" l10n="U" oldref="3">Table name</paragraph>
<paragraph role="paragraph" id="par_id3144740" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_TAB_WIZ_TABLENAME_EDIT">Specifies a name for the copy.</ahelp> Some databases only accept names containing eight or fewer characters.</paragraph>
<paragraph role="heading" id="hd_id3154228" xml-lang="en-US" level="2" l10n="U" oldref="5">Options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_DEFDATA" id="bm_id3147576" localize="false"/>
-<paragraph role="heading" id="hd_id3157898" xml-lang="en-US" level="3" l10n="U" oldref="7">Definition and data</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_DEFDATA" id="bm_id3147576" localize="false"/><paragraph role="heading" id="hd_id3157898" xml-lang="en-US" level="3" l10n="U" oldref="7">Definition and data</paragraph>
<paragraph role="paragraph" id="par_id3150178" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_DEFDATA">Creates a 1:1 copy of the database table.</ahelp> The table definition and the complete data are copied. The table definition includes the table structure and format from different data fields, including special field properties. The field contents supply the data.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_DEF" id="bm_id3147226" localize="false"/>
-<paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="3" l10n="U" oldref="9">Definition</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_DEF" id="bm_id3147226" localize="false"/><paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="3" l10n="U" oldref="9">Definition</paragraph>
<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_DEF">Copies only the table definition and not the corresponding data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_VIEW" id="bm_id3149096" localize="false"/>
-<paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="3" l10n="U" oldref="22">As table view</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_VIEW" id="bm_id3149096" localize="false"/><paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="3" l10n="U" oldref="22">As table view</paragraph>
<paragraph role="paragraph" id="par_id3153311" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_VIEW">If the database supports Views, you can select this option only when a query is copied in a table container. This option enables you to see and edit a query as a normal table view.</ahelp> The table will be filtered in the view with a "Select" SQL statement.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_APPENDDATA" id="bm_id3156347" localize="false"/>
-<paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="3" l10n="CHG" oldref="11">Append data<comment>see #i63815</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_APPENDDATA" id="bm_id3156347" localize="false"/><paragraph role="heading" id="hd_id3155535" xml-lang="en-US" level="3" l10n="CHG" oldref="11">Append data<comment>see #i63815</comment></paragraph>
<paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="DBACCESS_RADIOBUTTON_TAB_WIZ_COPYTABLE_RB_APPENDDATA">Appends the data of the table to be copied to an existing table.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3147275" xml-lang="en-US" l10n="U" oldref="13">The table definition must be exactly the same so that data can be copied. Data cannot be copied if a data field in the target table has another format than the data field in the source table.</paragraph>
<paragraph role="paragraph" id="par_id3156117" xml-lang="en-US" l10n="U" oldref="31">Match the data field names in the<emph> Copy Table</emph> dialog on the <link href="text/shared/explorer/database/05030400.xhp" name="Apply Columns">Apply Columns</link> page.</paragraph>
@@ -71,12 +67,10 @@
<paragraph role="note" id="par_id3158430" xml-lang="en-US" l10n="U" oldref="15">If the fields of the target table have a smaller field length than in the source table when data is being attached, the source data fields will automatically be truncated to match the field lengths in the target table.</paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149164"><bookmark_value>primary keys; defining</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_CHECKBOX_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN" id="bm_id3148564" localize="false"/>
-<paragraph role="heading" id="hd_id3149164" xml-lang="en-US" level="3" l10n="U" oldref="24">Create primary key</paragraph>
-<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="DBACCESS_CHECKBOX_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN"> Automatically generates a primary key data field and fills it with values.</ahelp><switchinline select="distrib"><caseinline select="COMMERCIAL">You should use this field if you copy a dBase table to the Adabas format, since in the Adabas format a primary key must always be available in order to edit the table.
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_CHECKBOX_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN" id="bm_id3148564" localize="false"/><paragraph role="heading" id="hd_id3149164" xml-lang="en-US" level="3" l10n="U" oldref="24">Create primary key</paragraph>
+<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="DBACCESS_CHECKBOX_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN"> Automatically generates a primary key data field and fills it with values.</ahelp><switchinline select="distrib"><caseinline select="COMMERCIAL">You should use this field if you copy a dBASE table to the Adabas format, since in the Adabas format a primary key must always be available in order to edit the table.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_TAB_WIZ_COPYTABLE_ET_KEYNAME" id="bm_id3147303" localize="false"/>
-<paragraph role="heading" id="hd_id3146794" xml-lang="en-US" level="3" l10n="U" oldref="26">Name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_TAB_WIZ_COPYTABLE_ET_KEYNAME" id="bm_id3147303" localize="false"/><paragraph role="heading" id="hd_id3146794" xml-lang="en-US" level="3" l10n="U" oldref="26">Name</paragraph>
<paragraph role="paragraph" id="par_id3156343" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="DBACCESS_EDIT_TAB_WIZ_COPYTABLE_ET_KEYNAME">Specifies a name for the primary key generated. This name is optional.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3151056" xml-lang="en-US" l10n="U" oldref="33"><link href="text/shared/explorer/database/05030200.xhp" name="Next page">Next page</link></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
index 741e5f694a..be95dfe877 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
***********************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabaadvpropdat.xhp,v $
+ * $RCSfile: dabaadvpropdat.xhp,v $fileonly,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: hr $ $Date: 2006-08-14 15:31:39 $
+ * last change: $Author: vg $ $Date: 2007-08-27 14:46:12 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -35,17 +36,14 @@
*
************************************************************************
-->
-
-<helpdocument version="1.0">
+
+
+ <helpdocument version="1.0">
<meta>
<topic id="textsharedexplorerdatabasedabaadvpropdatxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Special Settings</title>
<filename>/text/shared/explorer/database/dabaadvpropdat.xhp</filename>
</topic>
-<history>
-<created date="2004-07-30T11:21:39">Advanced Properties dialog Data handling tab page</created>
-<lastedited date="2006-05-16T13:13:03">dedr: reviewed</lastedited>
-</history>
</meta>
<body>
<section id="data">
@@ -59,10 +57,8 @@
<paragraph role="paragraph" id="par_id4572283" xml-lang="en-US" l10n="NEW">The availability of the following controls depends on the type of database:</paragraph>
<paragraph role="heading" id="par_idN10590" xml-lang="en-US" level="2" l10n="NEW">Use SQL92 naming constraints<comment>UFI: found this for dBase and for text file folder</comment></paragraph>
<paragraph role="paragraph" id="par_idN10594" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Only allows characters that conform to the SQL92 naming convention in a name in a data source. All other characters are rejected. Each name must begin with a lowercase letter, an uppercase letter, or an underscore ( _ ). The remaining characters can be ASCII letters, numbers, and underscores.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DOSLINEENDS" id="bm_id6617328" localize="false"/>
-<paragraph role="heading" id="hd_id3534958" xml-lang="en-US" level="2" l10n="NEW">End text lines with CR + LF<comment>UFI: found for dBase and text file folder</comment></paragraph>
-<paragraph role="paragraph" id="par_id6151921" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to use the CR + LF code pair to end every text line (preferred for DOS and Windows operating systems).</ahelp></paragraph><comment>UFI: check all Help IDs once all open CWSs are integrated</comment>
-<paragraph role="heading" id="par_idN1059E" xml-lang="en-US" level="2" l10n="NEW">Append the table alias name in SELECT statements</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DOSLINEENDS" id="bm_id6617328" localize="false"/><paragraph role="heading" id="hd_id3534958" xml-lang="en-US" level="2" l10n="NEW">End text lines with CR + LF<comment>UFI: found for dBase and text file folder</comment></paragraph>
+<paragraph role="paragraph" id="par_id6151921" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to use the CR + LF code pair to end every text line (preferred for DOS and Windows operating systems).</ahelp></paragraph><comment>UFI: check all Help IDs once all open CWSs are integrated</comment><paragraph role="heading" id="par_idN1059E" xml-lang="en-US" level="2" l10n="NEW">Append the table alias name in SELECT statements</paragraph>
<paragraph role="paragraph" id="par_idN105A2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Appends the alias to the table name in SELECT statements.</ahelp></paragraph>
<paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="2" l10n="NEW">Use Outer Join syntax '{OJ }'</paragraph>
<paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Use escape sequences for outer joins. The syntax for this escape sequence is {oj outer-join}</ahelp><comment>copied from shared\explorer\database\02010100.xhp</comment></paragraph>
@@ -75,7 +71,7 @@
<paragraph role="heading" id="par_idN105D2" xml-lang="en-US" level="2" l10n="NEW">Display version columns (when available)</paragraph>
<paragraph role="paragraph" id="par_idN105D6" xml-lang="en-US" l10n="NEW">Some databases assign version numbers to fields to track changes to records. The version number of a field is incremented by one each time the contents of the field are changed. <ahelp hid="HID_DSADMIN_SUPPRESS_VERSIONCL">Displays the internal version number of the record in the database table.</ahelp><comment>copied from shared\explorer\database\11090000.xhp</comment></paragraph>
<paragraph role="heading" id="par_idN105FA" xml-lang="en-US" level="2" l10n="NEW">Use the catalog name in SELECT statements</paragraph>
-<paragraph role="paragraph" id="par_idN105FE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Uses the current data source of the catalog. This option is useful when the ODBC data source is a database server. Do not select this option if the ODBC data source is a dBase driver.</ahelp><comment>copie from shared\explorer\database\11020000.xhp</comment></paragraph>
+<paragraph role="paragraph" id="par_idN105FE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Uses the current data source of the catalog. This option is useful when the ODBC data source is a database server. Do not select this option if the ODBC data source is a dBASE driver.</ahelp><comment>copie from shared\explorer\database\11020000.xhp</comment></paragraph>
<paragraph role="heading" id="par_idN10613" xml-lang="en-US" level="2" l10n="NEW">Use the schema name in SELECT statements</paragraph>
<paragraph role="paragraph" id="par_idN10617" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Allows you to use the schema name in SELECT statements.</ahelp></paragraph>
<paragraph role="heading" id="par_idN1061A" xml-lang="en-US" level="2" l10n="NEW">Create index with ASC or DESC statement</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp b/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp
index da7fd74b19..5dc0cebb1a 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
***********************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dabapropadd.xhp,v $
+ * $RCSfile: dabapropadd.xhp,v $fileonly,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: hr $ $Date: 2006-08-14 15:32:21 $
+ * last change: $Author: vg $ $Date: 2007-08-27 14:46:24 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -35,17 +36,14 @@
*
************************************************************************
-->
-
-<helpdocument version="1.0">
+
+
+ <helpdocument version="1.0">
<meta>
<topic id="textsharedexplorerdatabasedabapropaddxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Additional Settings</title>
<filename>/text/shared/explorer/database/dabapropadd.xhp</filename>
</topic>
-<history>
-<created date="2004-07-30T10:19:48">Database Properties dialog Additional Settings tab page</created>
-<lastedited date="2006-02-16T13:04:33">dedr: reviewed</lastedited>
-</history>
</meta>
<body>
<section id="dabapropadd">
@@ -62,29 +60,27 @@
<paragraph role="paragraph" id="par_idN105F6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the port number for the server that hosts the database.</ahelp><comment>UFI: used for LDAP and MySQL, different default values</comment></paragraph>
<paragraph role="heading" id="par_idN1057D" xml-lang="en-US" level="2" l10n="NEW">MySQL JDBC driver class</paragraph>
<paragraph role="paragraph" id="par_idN10615" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the JDBC driver for the MySQL database.</ahelp><comment>UFI: copied from shared\explorer\database\11110000.xhp but that was changed before (??)</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CHARSET" id="bm_id9317606" localize="false"/>
-<paragraph role="heading" id="par_idN10581" xml-lang="en-US" level="2" l10n="NEW">Character set<comment>UFI: seen for dBase</comment><comment>and for text file folder</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CHARSET" id="bm_id9317606" localize="false"/><paragraph role="heading" id="par_idN10581" xml-lang="en-US" level="2" l10n="NEW">Character set<comment>UFI: seen for dBase</comment><comment>and for text file folder</comment></paragraph>
<paragraph role="paragraph" id="par_idN10634" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the character set that you want to use to view the database in $[officename].</ahelp> This setting does not affect the database. To use the default character set of your operating system, select "System".</paragraph>
-<paragraph role="note" id="par_idN10651" xml-lang="en-US" l10n="NEW">Text and dBase databases are restricted to character sets with a fixed-size character length, where all characters are encoded with the same number of bytes.<comment>UFI. copied from shared\explorer\database\11020000.xhp</comment></paragraph>
+<paragraph role="note" id="par_idN10651" xml-lang="en-US" l10n="NEW">Text and dBASE databases are restricted to character sets with a fixed-size character length, where all characters are encoded with the same number of bytes.<comment>UFI. copied from shared\explorer\database\11020000.xhp</comment></paragraph>
<paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="2" l10n="NEW">Oracle JDBC driver class</paragraph>
<paragraph role="paragraph" id="par_idN10653" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the JDBC driver for the Oracle database.</ahelp><comment>UFI: copied from shared\explorer\database\11110000.xhp but that was changed before (??)</comment></paragraph>
<paragraph role="heading" id="par_idN10589" xml-lang="en-US" level="2" l10n="NEW">Driver settings</paragraph>
<paragraph role="paragraph" id="par_idN10672" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specify additional driver options.</ahelp><comment>UFI. copied from shared\explorer\database\11020000.xhp</comment></paragraph>
<paragraph role="heading" id="par_idN1058D" xml-lang="en-US" level="2" l10n="NEW">Use catalog for file-based databases</paragraph>
-<paragraph role="paragraph" id="par_idN10691" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Uses the current data source of the catalog. This option is useful when the ODBC data source is a database server. Do not select this option if the ODBC data source is a dBase driver.</ahelp><comment>UFI. copied from shared\explorer\database\11020000.xhp</comment></paragraph>
+<paragraph role="paragraph" id="par_idN10691" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Uses the current data source of the catalog. This option is useful when the ODBC data source is a database server. Do not select this option if the ODBC data source is a dBASE driver.</ahelp><comment>UFI. copied from shared\explorer\database\11020000.xhp</comment></paragraph>
<paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="2" l10n="NEW">Base DN</paragraph>
<paragraph role="paragraph" id="par_idN106B0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the starting point to search the LDAP database, for example, dc=com.</ahelp><comment>copied from shared\explorer\database\11190000.xhp</comment></paragraph>
<paragraph role="heading" id="par_idN10595" xml-lang="en-US" level="2" l10n="NEW">Maximum number of records</paragraph>
<paragraph role="paragraph" id="par_idN106F3" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the maximum number of records that you want to load when you access the LDAP server.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10599" xml-lang="en-US" level="2" l10n="NEW">Display deleted records as well<comment>UFI: seen for dBase, but Help ID is somewhere else</comment></paragraph>
<paragraph role="paragraph" id="par_idN10700" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays all the records in a file, including those marked as deleted. If you select this check box, you cannot delete records.</ahelp><comment>copied from shared\explorer\database\11030000.xhp</comment></paragraph>
-<paragraph role="note" id="par_idN10715" xml-lang="en-US" l10n="NEW">In dBase format, deleted records remain in the file.</paragraph>
+<paragraph role="note" id="par_idN10715" xml-lang="en-US" l10n="NEW">In dBASE format, deleted records remain in the file.</paragraph>
<paragraph role="tip" id="par_idN10718" xml-lang="en-US" l10n="NEW">To view changes that you make to the database, close the connection to the database, and then reconnect to the database.</paragraph>
<paragraph role="heading" id="par_idN1059D" xml-lang="en-US" level="2" l10n="NEW">Indexes<comment>UFI: seen for dBase</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10725" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens the Indexes dialog, where you can organize the table indexes in the current dBase database.</ahelp><comment>UFI: removed link from extended help text</comment></paragraph>
+<paragraph role="paragraph" id="par_idN10725" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens the Indexes dialog, where you can organize the table indexes in the current dBASE database.</ahelp><comment>UFI: removed link from extended help text</comment></paragraph>
<switch select="distrib">
-<case select="COMMERCIAL"><comment>UFI: Commercial means Adabas</comment>
-<paragraph role="heading" id="par_idN105A1" xml-lang="en-US" level="2" l10n="NEW">Data buffer size (MB)</paragraph>
+<case select="COMMERCIAL"><comment>UFI: Commercial means Adabas</comment><paragraph role="heading" id="par_idN105A1" xml-lang="en-US" level="2" l10n="NEW">Data buffer size (MB)</paragraph>
<paragraph role="paragraph" id="par_idN10742" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the size of the data buffer for the database. The setting takes effect after you restart the database.</ahelp><comment>copied from shared\explorer\database\11170000.xhp</comment></paragraph>
<paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="2" l10n="NEW">Data increment (MB)</paragraph>
<paragraph role="paragraph" id="par_idN10761" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the size by which you want to automatically increment the database. The maximum increment size is 100 MB. The setting takes effect after you restart the database.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp b/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
index b1721e231d..3ceeb114bf 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
@@ -1,48 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
***********************************************************************
*
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
+ * OpenOffice.org - a multi-platform office productivity suite
*
- * - GNU Lesser General Public License Version 2.1
- * - Sun Industry Standards Source License Version 1.1
+ * $RCSfile: dabapropgen.xhp,v $fileonly,v $
*
- * Sun Microsystems Inc., October, 2000
+ * $Revision: 1.7 $
*
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2000 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ * last change: $Author: vg $ $Date: 2007-08-27 14:46:35 $
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
*
************************************************************************
-->
-
-<helpdocument version="1.0">
+
+
+ <helpdocument version="1.0">
<meta>
<topic id="textsharedexplorerdatabasedabapropgenxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Advanced Properties</title>
<filename>/text/shared/explorer/database/dabapropgen.xhp</filename>
</topic>
-<history>
-<created date="2004-07-30T10:11:57">Database Properties dialog General tab page</created>
-<lastedited date="2006-02-16T13:02:57">dedr: reviewed</lastedited>
-</history>
</meta>
<body>
<section id="dabapropgen">
@@ -53,30 +54,24 @@
<paragraph role="paragraph" id="par_id4513992" xml-lang="en-US" l10n="NEW">In a database window, choose <emph>Edit - Database - Properties</emph>, click <emph>Advanced Properties</emph> tab</paragraph>
</section>
<paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW">The availability of the following controls depends on the type of database:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DBASE_PATH" id="bm_id4886623" localize="false"/>
-<paragraph role="heading" id="par_idN10575" xml-lang="en-US" level="2" l10n="NEW">Path to dBASE files<comment>UFI: found for dBase</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DBASE_PATH" id="bm_id4886623" localize="false"/><paragraph role="heading" id="par_idN10575" xml-lang="en-US" level="2" l10n="NEW">Path to dBASE files<comment>UFI: found for dBase</comment></paragraph>
<paragraph role="paragraph" id="par_idN10579" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the path to the directory that contains the dBASE files.</ahelp></paragraph>
-<paragraph role="warning" id="par_idN1057C" xml-lang="en-US" l10n="NEW">Ensure that the *.dbf file name extension of the dBase files is lowercase.<comment>moved from shared\explorer\database\11030000.xhp</comment></paragraph>
+<paragraph role="warning" id="par_idN1057C" xml-lang="en-US" l10n="NEW">Ensure that the *.dbf file name extension of the dBASE files is lowercase.<comment>moved from shared\explorer\database\11030000.xhp</comment></paragraph>
<paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="2" l10n="NEW">Browse<comment>UFI: found for dBase</comment></paragraph>
<paragraph role="paragraph" id="par_idN10595" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a dialog where you can select a file or a directory.</ahelp><comment>which one? or depends?</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_PushButton_PAGE_CONNECTION_PB_TESTCONNECTION" id="bm_id7854243" localize="false"/>
-<paragraph role="heading" id="par_idN105AA" xml-lang="en-US" level="2" l10n="NEW">Test Connection<comment>UFI: found for dBase</comment><comment>and for Calc doc</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess_PushButton_PAGE_CONNECTION_PB_TESTCONNECTION" id="bm_id7854243" localize="false"/><paragraph role="heading" id="par_idN105AA" xml-lang="en-US" level="2" l10n="NEW">Test Connection<comment>UFI: found for dBase</comment><comment>and for Calc doc</comment></paragraph>
<paragraph role="paragraph" id="par_idN105AE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tests the database connection with the current settings.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_FLAT_PATH" id="bm_id4529251" localize="false"/>
-<paragraph role="heading" id="par_idN105B1" xml-lang="en-US" level="2" l10n="NEW">Path to the text files<comment>UFI: found for text file folder</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_FLAT_PATH" id="bm_id4529251" localize="false"/><paragraph role="heading" id="par_idN105B1" xml-lang="en-US" level="2" l10n="NEW">Path to the text files<comment>UFI: found for text file folder</comment></paragraph>
<paragraph role="paragraph" id="par_idN105B5" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enter the path to the folder of the text files.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CALC_PATH" id="bm_id8492385" localize="false"/>
-<paragraph role="heading" id="par_idN105B8" xml-lang="en-US" level="2" l10n="NEW">Path to the spreadsheet document<comment>UFI: found for a Calc doc</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CALC_PATH" id="bm_id8492385" localize="false"/><paragraph role="heading" id="par_idN105B8" xml-lang="en-US" level="2" l10n="NEW">Path to the spreadsheet document<comment>UFI: found for a Calc doc</comment></paragraph>
<paragraph role="paragraph" id="par_idN105BC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the path to the spreadsheet document that you want to use as a database.</ahelp></paragraph>
<paragraph role="heading" id="par_idN105BF" xml-lang="en-US" level="2" l10n="NEW">Name of the ODBC data source on your system</paragraph>
<paragraph role="paragraph" id="par_idN105C3" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the ODBC data source.</ahelp></paragraph>
<paragraph role="heading" id="par_idN105C6" xml-lang="en-US" level="2" l10n="NEW">User name</paragraph>
<paragraph role="paragraph" id="par_idN105CA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the user name that is required to access the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_CheckBox_PAGE_CONNECTION_CB_PASSWORD_REQUIRED" id="bm_id4072084" localize="false"/>
-<paragraph role="heading" id="par_idN105CD" xml-lang="en-US" level="2" l10n="NEW">Password required<comment>UFI: found for Calc doc</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess_CheckBox_PAGE_CONNECTION_CB_PASSWORD_REQUIRED" id="bm_id4072084" localize="false"/><paragraph role="heading" id="par_idN105CD" xml-lang="en-US" level="2" l10n="NEW">Password required<comment>UFI: found for Calc doc</comment></paragraph>
<paragraph role="paragraph" id="par_idN105D1" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If checked, the user will be asked to enter the password that is required to access the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME" id="bm_id7675099" localize="false"/>
-<paragraph role="heading" id="hd_id7806329" xml-lang="en-US" level="2" l10n="NEW">Name of the database<comment>UFI: found for JDBC</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME" id="bm_id7675099" localize="false"/><paragraph role="heading" id="hd_id7806329" xml-lang="en-US" level="2" l10n="NEW">Name of the database<comment>UFI: found for JDBC</comment></paragraph>
<paragraph role="paragraph" id="par_id5589159" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the database.</ahelp></paragraph>
<paragraph role="heading" id="par_idN105D4" xml-lang="en-US" level="2" l10n="NEW">Name of the MySQL database</paragraph>
<paragraph role="paragraph" id="par_idN105D8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the MySQL database that you want to use as a data source.</ahelp></paragraph>
@@ -89,20 +84,16 @@
<paragraph role="heading" id="par_idN105F7" xml-lang="en-US" level="2" l10n="NEW">Data source URL</paragraph>
<paragraph role="paragraph" id="par_idN105FB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the location of the JDBC data source as a URL.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS" id="bm_id9936216" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/39110" id="bm_id5591296" localize="false"/>
-<paragraph role="heading" id="par_idN105FE" xml-lang="en-US" level="2" l10n="NEW">JDBC driver class</paragraph>
+<bookmark xml-lang="en-US" branch="hid/39110" id="bm_id5591296" localize="false"/><paragraph role="heading" id="par_idN105FE" xml-lang="en-US" level="2" l10n="NEW">JDBC driver class</paragraph>
<paragraph role="paragraph" id="par_idN10602" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the JDBC driver class that connects to the data source.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS" id="bm_id7953123" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/39111" id="bm_id4361705" localize="false"/>
-<paragraph role="heading" id="par_idN10605" xml-lang="en-US" level="2" l10n="NEW">Test Class<comment>UFI: found for JDBC</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/39111" id="bm_id4361705" localize="false"/><paragraph role="heading" id="par_idN10605" xml-lang="en-US" level="2" l10n="NEW">Test Class<comment>UFI: found for JDBC</comment></paragraph>
<paragraph role="paragraph" id="par_idN10609" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tests the database connection through the JDBC driver class.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10613" xml-lang="en-US" level="3" l10n="NEW">Choose a database</paragraph>
<paragraph role="paragraph" id="par_idN10617" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a database from the list or click <emph>Create</emph> to create a new database.</ahelp></paragraph>
<switch select="distrib">
-<case select="COMMERCIAL">
-<paragraph role="heading" id="par_idN1061E" xml-lang="en-US" level="3" l10n="NEW">Create</paragraph>
+<case select="COMMERCIAL"><paragraph role="heading" id="par_idN1061E" xml-lang="en-US" level="3" l10n="NEW">Create</paragraph>
<paragraph role="paragraph" id="par_idN10622" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/explorer/database/30100000.xhp">Create New Adabas D Database</link> dialog.</ahelp></paragraph>
</case>
-</switch>
-</body>
+</switch></body>
</helpdocument>