diff options
| author | Rafael Lima <rafael.palma.lima@gmail.com> | 2022-11-18 15:45:37 +0100 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2022-11-22 15:43:38 +0100 |
| commit | 8e7f48e5e03d5588b00d341c5a82fa1a74b2bdd9 (patch) | |
| tree | 876ca29c9cc608134f5d038d631a0d11111fccc7 | |
| parent | 2bec94db3019501780538dd7143ec90eab55ed92 (diff) | |
tdf#151827 Improve the ODBC connection help page
As requested by the OP this page clarifies that we're actually connecting to a ODBC data source.
I also made other improvements to the text and fixed the case when the user presses F1 in the Data Source selection dialog.
Change-Id: I89817df62e5dadaa4e1258768f442bbc4bb08fe7
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/142916
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
| -rw-r--r-- | source/text/sdatabase/dabawiz02odbc.xhp | 52 | ||||
| -rw-r--r-- | source/text/sdatabase/dabawiz03auth.xhp | 2 |
2 files changed, 30 insertions, 24 deletions
diff --git a/source/text/sdatabase/dabawiz02odbc.xhp b/source/text/sdatabase/dabawiz02odbc.xhp index 0a69034c2f..59d5738366 100644 --- a/source/text/sdatabase/dabawiz02odbc.xhp +++ b/source/text/sdatabase/dabawiz02odbc.xhp @@ -16,36 +16,42 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> + <helpdocument version="1.0"> -<meta> -<topic id="textsharedexplorerdatabasedabawiz02odbcxml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">ODBC Connection</title> -<filename>/text/sdatabase/dabawiz02odbc.xhp</filename> -</topic> -<history> -<created date="2004-07-28T16:27:31">UFI: Database Wizard ODBC page</created> -</history> -</meta> + <meta> + <topic id="textsharedexplorerdatabasedabawiz02odbcxml" indexer="include" status="PUBLISH"> + <title id="tit" xml-lang="en-US">ODBC Connection</title> + <filename>/text/sdatabase/dabawiz02odbc.xhp</filename> + </topic> + </meta> + <body> -<bookmark xml-lang="en-US" branch="index" id="bm_id3149031"><bookmark_value>ODBC;database (Base)</bookmark_value> -<bookmark_value>databases;ODBC (Base)</bookmark_value> -</bookmark><comment>mw added "(Base)" to all entries</comment> -<h1 id="par_idN1053D"><variable id="odbc"><link href="text/sdatabase/dabawiz02odbc.xhp">ODBC Connection</link> -</variable></h1> -<paragraph role="paragraph" id="par_idN10541" xml-lang="en-US"><ahelp hid=".">Specifies the settings for <link href="text/shared/00/00000005.xhp#odbc" name="ODBC">ODBC</link> databases.</ahelp></paragraph> -<paragraph role="paragraph" id="par_id8856776" xml-lang="en-US">To edit or add records to a database table in $[officename], the table must have a unique index field.</paragraph> -<paragraph role="paragraph" id="par_id8034302" xml-lang="en-US">On Solaris and Linux platforms, try to use a JDBC driver instead of an ODBC driver. See http://www.unixodbc.org for an ODBC implementation on Solaris or Linux.</paragraph> +<bookmark xml-lang="en-US" branch="index" id="bm_id3149031"> + <bookmark_value>ODBC;data sources (Base)</bookmark_value> + <bookmark_value>data sources;ODBC (Base)</bookmark_value> +</bookmark> + +<h1 id="par_idN1053D"><variable id="odbc"><link href="text/sdatabase/dabawiz02odbc.xhp">ODBC Connection</link></variable></h1> +<paragraph role="paragraph" id="par_idN10541" xml-lang="en-US"><ahelp hid=".">Specifies the settings for an <link href="text/shared/00/00000005.xhp#odbc" name="ODBC">ODBC</link> data source connection.</ahelp></paragraph> +<paragraph role="paragraph" id="par_id8034302" xml-lang="en-US">On Solaris and Linux platforms, try using the JDBC driver instead of the ODBC driver. Refer to the <link href="http://www.unixodbc.org" name="CHANGE ME">unixODBC Project</link> web page for an ODBC implementation on Solaris or Linux.</paragraph> <paragraph role="paragraph" id="par_id8560136" xml-lang="en-US">To connect to a Microsoft Access database on Windows, use the ADO or Access database interface, rather than ODBC.</paragraph> <note id="par_id2082583">Drivers for ODBC are supplied and supported by the manufacturer of the database. $[officename] only supports the ODBC 3 standard.</note> + <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE" id="bm_id9201025" localize="false"/> -<h2 id="par_idN10552">Name of the ODBC database</h2> -<paragraph role="paragraph" id="par_idN10556" xml-lang="en-US"><ahelp hid=".">Enter the path to the database file.</ahelp></paragraph> +<h2 id="par_idN10552">Name of the ODBC data source</h2> +<paragraph role="paragraph" id="par_idN10556" xml-lang="en-US"><ahelp hid=".">Enter the name of the data source registered in %PRODUCTNAME.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE" id="bm_id5588549" localize="false"/> <h2 id="par_idN10559">Browse</h2> -<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US"><ahelp hid=".">Click to open an ODBC data source selection dialog:</ahelp></paragraph> +<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US"><ahelp hid=".">Click to open the ODBC data source selection dialog.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/choosedatasourcedialog/dialog-action_area1" id="bm_id861668782401603" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/choosedatasourcedialog/treeview" id="bm_id861668782401604" localize="false"/> <h3 id="par_idN10560">Choose a data source</h3> -<paragraph role="paragraph" id="par_idN10564" xml-lang="en-US"><ahelp hid=".">Select a data source to which you want to connect using ODBC. Then click <emph>OK</emph>.</ahelp></paragraph> -<paragraph role="paragraph" id="par_idN10567" xml-lang="en-US"><link href="text/sdatabase/dabawiz03auth.xhp">Authentication</link></paragraph> -<paragraph role="paragraph" localize="false" id="par_idN1061A" xml-lang="en-US"><embedvar href="text/sdatabase/dabawiz00.xhp#databasewizardh1"/></paragraph> +<paragraph role="paragraph" id="par_idN10564" xml-lang="en-US"><ahelp hid=".">Select the data source to which you want to connect using ODBC. Then click <menuitem>OK</menuitem>.</ahelp></paragraph> +<note id="par_id811668782045534">To edit or add records to a database table in %PRODUCTNAME, the table must have a unique index field.</note> + + <section id="relatedtopics"> + <embed href="text/sdatabase/dabawiz00.xhp#databasewizardh1"/> + <embed href="text/sdatabase/dabawiz03auth.xhp#authentication_h1"/> + </section> </body> </helpdocument> diff --git a/source/text/sdatabase/dabawiz03auth.xhp b/source/text/sdatabase/dabawiz03auth.xhp index cd91d9e152..f9011c3a3d 100644 --- a/source/text/sdatabase/dabawiz03auth.xhp +++ b/source/text/sdatabase/dabawiz03auth.xhp @@ -27,7 +27,7 @@ </history> </meta> <body> -<h1 id="par_idN1053A">Set up user authentication</h1> +<h1 id="par_idN1053A"><variable id="authentication_h1"><link href="text/sdatabase/dabawiz03auth.xhp" name="auth_link">Set up user authentication</link></variable></h1> <paragraph role="paragraph" id="par_idN1053E" xml-lang="en-US">Some databases require a user name and password.</paragraph> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/authentificationpage/generalUserNameEntry" id="bm_id5520493" localize="false"/> <h2 id="par_idN10541">User name</h2> |