From 8e7f48e5e03d5588b00d341c5a82fa1a74b2bdd9 Mon Sep 17 00:00:00 2001 From: Rafael Lima Date: Fri, 18 Nov 2022 15:45:37 +0100 Subject: 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 --- source/text/sdatabase/dabawiz02odbc.xhp | 52 ++++++++++++++++++--------------- 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 . --> + - - -ODBC Connection -/text/sdatabase/dabawiz02odbc.xhp - - -UFI: Database Wizard ODBC page - - + + + ODBC Connection + /text/sdatabase/dabawiz02odbc.xhp + + + -ODBC;database (Base) -databases;ODBC (Base) -mw added "(Base)" to all entries -

ODBC Connection -

-Specifies the settings for ODBC databases. -To edit or add records to a database table in $[officename], the table must have a unique index field. -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. + + ODBC;data sources (Base) + data sources;ODBC (Base) + + +

ODBC Connection

+Specifies the settings for an ODBC data source connection. +On Solaris and Linux platforms, try using the JDBC driver instead of the ODBC driver. Refer to the unixODBC Project web page for an ODBC implementation on Solaris or Linux. To connect to a Microsoft Access database on Windows, use the ADO or Access database interface, rather than ODBC. Drivers for ODBC are supplied and supported by the manufacturer of the database. $[officename] only supports the ODBC 3 standard. + -

Name of the ODBC database

-Enter the path to the database file. +

Name of the ODBC data source

+Enter the name of the data source registered in %PRODUCTNAME.

Browse

-Click to open an ODBC data source selection dialog: +Click to open the ODBC data source selection dialog. + +

Choose a data source

-Select a data source to which you want to connect using ODBC. Then click OK. -Authentication - +Select the data source to which you want to connect using ODBC. Then click OK. +To edit or add records to a database table in %PRODUCTNAME, the table must have a unique index field. + +

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 @@ -

Set up user authentication

Some databases require a user name and password.

User name

-- cgit