diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-08 15:31:03 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-08 15:31:03 +0000 |
| commit | 718acae032e18e6b49caa95ee34d285499ce4da1 (patch) | |
| tree | ede01bb4e265d7522303975188f34d50ad919f03 | |
| parent | INTEGRATION: CWS hc680pb2 (1.1.2); FILE ADDED (diff) | |
| download | help-718acae032e18e6b49caa95ee34d285499ce4da1.tar.gz help-718acae032e18e6b49caa95ee34d285499ce4da1.zip | |
INTEGRATION: CWS hc680pb2 (1.4.4); FILE MERGED
2005/02/10 09:45:39 fpe 1.4.4.1: regular update - missing HIDs added
5 files changed, 39 insertions, 23 deletions
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02.xhp index e4917f3e0e..a9a439628d 100755 --- a/helpcontent2/source/text/shared/explorer/database/dabawiz02.xhp +++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02.xhp @@ -37,8 +37,8 @@ * License at http://www.openoffice.org/license.html. * * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. * See the License for the specific provisions governing your rights and * obligations concerning the Software. @@ -62,7 +62,7 @@ </topic> <history> <created date="2004-07-28T14:21:35">UFI: Database Wizard page 2</created> -<lastedited date="2004-09-22T13:19:32">YJ: checked</lastedited> +<lastedited date="2005-02-07T13:15:10">YJ: checked</lastedited> </history> </meta> <body> @@ -70,12 +70,16 @@ <paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02.xhp">Next Steps</link></paragraph> <paragraph role="paragraph" id="par_idN10554" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies whether you want to register the database, open the database for editing, or insert a new table.</ahelp></paragraph> </section> +<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE" id="bm_id9310281" localize="false"/> <paragraph role="heading" id="par_idN10557" xml-lang="en-US" level="2" l10n="NEW">Yes, register the Database for me</paragraph> <paragraph role="paragraph" id="par_idN105B4" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to register the database within your user copy of %PRODUCTNAME. After registering, the database is displayed in the <emph>View - Data Sources</emph> window.</ahelp></paragraph> -<paragraph role="heading" id="par_idN105B7" xml-lang="en-US" level="2" l10n="NEW">No, I'll register the database</paragraph> -<paragraph role="paragraph" id="par_idN105BB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to keep the database information only within the created database document.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE" id="bm_id8243354" localize="false"/> +<paragraph role="heading" id="par_idN105B7" xml-lang="en-US" level="2" l10n="NEW">No, do not register the database</paragraph> +<paragraph role="paragraph" id="par_idN105BB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to keep the database information only within the created database file.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS" id="bm_id971404" localize="false"/> <paragraph role="heading" id="par_idN1055B" xml-lang="en-US" level="2" l10n="NEW">Open the database for editing</paragraph> -<paragraph role="paragraph" id="par_idN105C6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to display the database document window, where you can edit the database structure.</ahelp><comment>UFI: is it so?</comment></paragraph> +<paragraph role="paragraph" id="par_idN105C6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to display the database file, where you can edit the database structure.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD" id="bm_id1763359" localize="false"/> <paragraph role="heading" id="par_idN1055F" xml-lang="en-US" level="2" l10n="NEW">Create tables using the table wizard</paragraph> <paragraph role="paragraph" id="par_idN105D1" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to call the <link href="text/shared/explorer/database/tablewizard00.xhp">Table Wizard</link> after the Database Wizard is finished.</ahelp></paragraph> <paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph> diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp index 9a8705b1a4..25c445466c 100755 --- a/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp +++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp @@ -37,8 +37,8 @@ * License at http://www.openoffice.org/license.html. * * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. * See the License for the specific provisions governing your rights and * obligations concerning the Software. @@ -62,14 +62,16 @@ </topic> <history> <created date="2004-07-28T15:19:22">UFI: Database Wizard MS Access page</created> -<lastedited date="2004-09-22T13:26:50">YJ: checked</lastedited> +<lastedited date="2005-02-07T13:32:37">YJ: checked</lastedited> </history> </meta> <body> <paragraph role="heading" id="par_idN1053D" xml-lang="en-US" level="1" l10n="NEW">Microsoft Access Connection</paragraph> <paragraph role="paragraph" id="par_idN10541" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the settings for importing a database file in Microsoft Access format.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION" id="bm_id627155" localize="false"/> <paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="2" l10n="NEW">Microsoft Access database file</paragraph> <paragraph role="paragraph" id="par_idN10548" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the path to the database file.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION" id="bm_id8335215" localize="false"/> <paragraph role="heading" id="par_idN1054B" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph> <paragraph role="paragraph" id="par_idN1054F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to open a file selection dialog.</ahelp></paragraph> <paragraph role="paragraph" id="par_idN10552" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph> diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02ado.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02ado.xhp index 11dae2f444..c90350652f 100755 --- a/helpcontent2/source/text/shared/explorer/database/dabawiz02ado.xhp +++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02ado.xhp @@ -37,8 +37,8 @@ * License at http://www.openoffice.org/license.html. * * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. * See the License for the specific provisions governing your rights and * obligations concerning the Software. @@ -62,7 +62,7 @@ </topic> <history> <created date="2004-07-28T15:45:26">UFI: Database Wizard ADO page</created> -<lastedited date="2004-09-22T13:28:35">YJ: checked</lastedited> +<lastedited date="2005-02-07T13:21:05">YJ: checked</lastedited> </history> </meta> <body> @@ -70,6 +70,7 @@ <paragraph role="paragraph" id="par_idN10550" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the options for adding an ADO (Microsoft ActiveX Data Objects) database.</ahelp><comment>UFI: copied text from shared\explorer\database\11160000</comment></paragraph> <paragraph role="note" id="par_idN10565" xml-lang="en-US" l10n="NEW">The ADO interface is a Microsoft Windows proprietary container for connecting to databases.</paragraph> <paragraph role="tip" id="par_idN10568" xml-lang="en-US" l10n="NEW">$[officename] requires the Microsoft Data Access Components (MDAC) to use the ADO interface. Microsoft Windows 2000 and XP include these components by default. For earlier visions of Windows, you need to install MDAC separately. You can download MDAC from the Microsoft web site.</paragraph> +<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_ADO_ET_ADOURL" id="bm_id2960600" localize="false"/> <paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="2" l10n="NEW">Data source URL</paragraph> <paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the data source URL.</ahelp></paragraph> <paragraph role="heading" id="par_idN105BB" xml-lang="en-US" level="2" l10n="NEW">JDBC driver class</paragraph> @@ -80,10 +81,9 @@ <paragraph role="example" id="par_idN1057F" xml-lang="en-US" l10n="NEW">PROVIDER=sqloledb;DATA SOURCE=turner;INITIAL CATALOG=First</paragraph> <paragraph role="paragraph" id="par_idN10582" xml-lang="en-US" l10n="NEW">To access an ODBC driver as a provider:</paragraph> <paragraph role="example" id="par_idN10585" xml-lang="en-US" l10n="NEW">DSN=SQLSERVER</paragraph> +<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_ADO_PB_ADOURL" id="bm_id7212439" localize="false"/> <paragraph role="heading" id="par_idN10588" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph> -<paragraph role="paragraph" id="par_idN1058C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to open a file selection dialog.</ahelp></paragraph> -<paragraph role="heading" id="par_idN1058F" xml-lang="en-US" level="2" l10n="NEW">Test Connection</paragraph> -<paragraph role="paragraph" id="par_idN10593" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to test the connection using the current settings.</ahelp></paragraph> +<paragraph role="paragraph" id="par_idN1058C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to open a database selection dialog.</ahelp></paragraph> <paragraph role="note" id="par_idN10596" xml-lang="en-US" l10n="NEW">A user name can have a maximum of 18 characters.</paragraph> <paragraph role="note" id="par_idN10599" xml-lang="en-US" l10n="NEW">A password must contain 3 to 18 characters.</paragraph> <paragraph role="paragraph" id="par_idN1059C" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph> diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp index 4a6d93cd0a..8ebbf4ce99 100755 --- a/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp +++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp @@ -62,7 +62,7 @@ </topic> <history> <created date="2004-07-28T15:55:36">UFI: Database Wizard JDBC page</created> -<lastedited date="2005-01-10T13:56:30">DEDR: reviewed</lastedited> +<lastedited date="2005-02-07T13:46:15">DEDR: reviewed</lastedited> </history> </meta> <body> @@ -94,6 +94,7 @@ <paragraph role="listitem" id="par_idN1067C" xml-lang="en-US" l10n="NEW">database_name is the name of the Oracle database. Ask your database administrator for the correct name.</paragraph> </listitem> </list> +<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER" id="bm_id3033539" localize="false"/> <paragraph role="heading" id="par_idN1067F" xml-lang="en-US" level="3" l10n="NEW">MySQL database</paragraph> <paragraph role="paragraph" id="par_idN10683" xml-lang="en-US" l10n="NEW">The mm.mysql-2.0.4-bin.jar driver archive for the MySQL database is available on the following web site:</paragraph> <paragraph role="paragraph" id="par_idN10686" xml-lang="en-US" l10n="NEW">http://mmmysql.sourceforge.net/oldDist.html</paragraph> @@ -101,7 +102,7 @@ <paragraph role="example" id="par_idN1068C" xml-lang="en-US" l10n="NEW">mysql://hostname:port/database_name</paragraph> <list type="unordered"> <listitem> -<paragraph role="listitem" id="par_idN10695" xml-lang="en-US" l10n="NEW">hostname is the name of the machine that runs the MySQL database. You can also replace hostname with the IP address of the server.</paragraph> +<paragraph role="listitem" id="par_idN10695" xml-lang="en-US" l10n="NEW"><ahelp hid=".">hostname is the name of the machine that runs the MySQL database.</ahelp> You can also replace hostname with the IP address of the server.</paragraph> </listitem> <listitem> <paragraph role="listitem" id="par_idN10699" xml-lang="en-US" l10n="NEW">port is the default port for MySQL databases, namely 3306.</paragraph> @@ -110,12 +111,17 @@ <paragraph role="listitem" id="par_idN1069D" xml-lang="en-US" l10n="NEW">database_name is the name of the database.</paragraph> </listitem> </list> +<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL" id="bm_id6293221" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT" id="bm_id3450117" localize="false"/> <paragraph role="heading" id="par_idN106A0" xml-lang="en-US" level="2" l10n="NEW">Data source URL</paragraph> <paragraph role="paragraph" id="par_idN106A4" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_CONNURL_JDBCPAGE">Enter the URL for the database. For example, for the MySQL JDBC driver, enter "jdbc:mysql://<Servername>/<name of the database>". For more information on the JDBC driver, consult the documentation that came with the driver.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DRIVERCLASS" id="bm_id3153970" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/852248660" id="bm_id3400372" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/852330580" id="bm_id7055879" localize="false"/> <paragraph role="heading" id="par_idN106BB" xml-lang="en-US" level="2" l10n="NEW">JDBC Driver Class</paragraph> <paragraph role="paragraph" id="par_idN106BF" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_DRIVERCLASS">Enter the name of the JDBC driver.</ahelp></paragraph> -<paragraph role="heading" id="par_idN106CE" xml-lang="en-US" level="2" l10n="NEW">Test Connection<comment>UFI: may be Test Class - both strings are in spec</comment></paragraph> +<bookmark xml-lang="en-US" branch="hid/852251216" id="bm_id3968932" localize="false"/> +<paragraph role="heading" id="par_idN106CE" xml-lang="en-US" level="2" l10n="NEW">Test Class<comment>UFI: may be Test Connection - both strings are in spec</comment></paragraph> <paragraph role="paragraph" id="par_idN106E4" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tests the connection with the current settings.</ahelp></paragraph> <paragraph role="paragraph" id="par_idN106E7" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz03auth.xhp">Authentication</link></paragraph> <paragraph role="paragraph" id="par_idN106F6" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph> diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp index 84946590dd..3dc9bb63bc 100755 --- a/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp +++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp @@ -37,8 +37,8 @@ * License at http://www.openoffice.org/license.html. * * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. * See the License for the specific provisions governing your rights and * obligations concerning the Software. @@ -62,22 +62,26 @@ </topic> <history> <created date="2004-07-28T15:24:27">UFI: Database Wizard LDAP page</created> -<lastedited date="2004-09-22T13:30:21">YJ: checked</lastedited> +<lastedited date="2005-02-07T13:30:45">YJ: checked</lastedited> </history> </meta> <body> <paragraph role="heading" id="par_idN10554" xml-lang="en-US" level="1" l10n="NEW">LDAP Connection</paragraph> <paragraph role="paragraph" id="par_idN10558" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the settings for importing a database using LDAP</ahelp> (<emph>Lightweight Directory Access Protocol)</emph>. This page is only available if you registered an LDAP server as an address database.<comment>UFI: copied text from shared\explorer\database\11190000</comment></paragraph> <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_LDAP_HOSTNAME" id="bm_id3147275" localize="false"/> -<paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="2" l10n="NEW">Host name</paragraph> +<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER" id="bm_id7872249" localize="false"/> +<paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="2" l10n="NEW">Server URL</paragraph> <paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_LDAP_HOSTNAME">Enter the name of the LDAP server using the format "ldap.server.com".</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_LDAP_BASEDN" id="bm_id3145315" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_LDAP_ET_BASEDN" id="bm_id7593920" localize="false"/> <paragraph role="heading" id="par_idN10594" xml-lang="en-US" level="2" l10n="NEW">Base DN</paragraph> <paragraph role="paragraph" id="par_idN10598" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_LDAP_BASEDN">Enter the starting point to search the LDAP database, for example, "dc=com".</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_LDAP_PORTNUMBER" id="bm_id3155341" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER" id="bm_id5359660" localize="false"/> <paragraph role="heading" id="par_idN105B7" xml-lang="en-US" level="2" l10n="NEW">Port number</paragraph> <paragraph role="paragraph" id="par_idN105BB" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_LDAP_PORTNUMBER">Enter the port of the LDAP server, normally 389.</ahelp></paragraph> -<paragraph role="heading" id="par_idN105CA" xml-lang="en-US" level="3" l10n="NEW">Use secure connection (SSL)<comment>UFI: deleted Help-ID because it seems to be re-used on another object</comment></paragraph> +<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_LDAP_CB_USESSL" id="bm_id9989623" localize="false"/> +<paragraph role="heading" id="par_idN105CA" xml-lang="en-US" level="3" l10n="NEW">Use secure connection (SSL)</paragraph> <paragraph role="paragraph" id="par_idN105CE" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_USESSL_LDAP">Creates a secure connection to the LDAP server through the Secure Sockets Layer (SSL).</ahelp> By default, an SSL connection uses port 636. A regular connection uses port 389.</paragraph> <paragraph role="paragraph" id="par_idN105DE" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz03auth.xhp">Authentication</link></paragraph> <paragraph role="paragraph" id="par_idN105F5" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph> |