diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-08 15:31:21 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-08 15:31:21 +0000 |
| commit | 50fca6b4db51cdcd631ce7c8375c58203257b412 (patch) | |
| tree | fb68a01a9b3418c14dcab0e085ce8363bd44b3e7 /helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp | |
| parent | 718acae032e18e6b49caa95ee34d285499ce4da1 (diff) | |
INTEGRATION: CWS hc680pb2 (1.4.4); FILE MERGED
2005/02/10 09:45:40 fpe 1.4.4.1: regular update - missing HIDs added
Diffstat (limited to 'helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp')
| -rwxr-xr-x | helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp index f91cbe5871..bb5d5c9ab9 100755 --- a/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp +++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.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-28T16:18:21">UFI: Database Wizard MySQL page</created> -<lastedited date="2004-09-22T13:48:39">YJ: checked</lastedited> +<lastedited date="2005-02-07T13:34:19">YJ: checked</lastedited> </history> </meta> <body> <paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW">MySQL Connection</paragraph> <paragraph role="paragraph" id="par_idN1054D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the options for MySQL databases.</ahelp><comment>text copied from shared\explorer\database\11120000</comment></paragraph> +<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC" id="bm_id6776940" localize="false"/> <paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="2" l10n="NEW">Connect using ODBC (Open Database Connectivity)</paragraph> <paragraph role="paragraph" id="par_idN10566" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Connects to an existing ODBC data source that was set on a system level.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC" id="bm_id4285409" localize="false"/> <paragraph role="heading" id="par_idN10569" xml-lang="en-US" level="2" l10n="NEW">Connect using JDBC (Java Database Connectivity)</paragraph> <paragraph role="paragraph" id="par_idN1056D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Connects to an existing JDBC data source that was set on a system level.</ahelp></paragraph> <paragraph role="paragraph" id="par_idN10570" xml-lang="en-US" l10n="NEW">The next wizard page depends on your choice of ODBC or JDBC:</paragraph> |