summaryrefslogtreecommitdiff
path: root/source/text/shared/explorer
diff options
context:
space:
mode:
authorGabor Kelemen <kelemeng@gnome.hu>2017-01-07 14:20:48 +0100
committerGabor Kelemen <kelemeng@ubuntu.com>2017-01-08 21:57:21 +0000
commit9ce74cec5a7f95ac442c9caa22aa16839d807581 (patch)
treed71459e3194783b4d6f359615f975a813c67553f /source/text/shared/explorer
parent5e4b205a3259f265e6dddc578d16793c1a733e9e (diff)
Move bookmarks and ahelps to DB Wizard Auth page
...from the ADO connection page. Also document the 'Test Connection' button a bit. Change-Id: I7d5b13baeb8ffb348ffea1c9a991b4498e8f5cc9 Reviewed-on: https://gerrit.libreoffice.org/32831 Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com> Tested-by: Gabor Kelemen <kelemeng@ubuntu.com>
Diffstat (limited to 'source/text/shared/explorer')
-rw-r--r--source/text/shared/explorer/database/dabawiz02ado.xhp6
-rw-r--r--source/text/shared/explorer/database/dabawiz03auth.xhp7
2 files changed, 8 insertions, 5 deletions
diff --git a/source/text/shared/explorer/database/dabawiz02ado.xhp b/source/text/shared/explorer/database/dabawiz02ado.xhp
index e28ea5b576..af95710800 100644
--- a/source/text/shared/explorer/database/dabawiz02ado.xhp
+++ b/source/text/shared/explorer/database/dabawiz02ado.xhp
@@ -53,10 +53,8 @@
<bookmark xml-lang="en-US" branch="hid/DBACCESS_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 database selection dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/authentificationpage/generalUserNameEntry" id="bm_id5520493" localize="false"/>
-<paragraph role="note" id="par_idN10596" xml-lang="en-US" l10n="NEW"><ahelp hid=".">A user name can have a maximum of 18 characters.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/authentificationpage/passRequiredCheckbutton" id="bm_id6467787" localize="false"/>
-<paragraph role="note" id="par_idN10599" xml-lang="en-US" l10n="NEW"><ahelp hid=".">A password must contain 3 to 18 characters.</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>
</body>
</helpdocument>
diff --git a/source/text/shared/explorer/database/dabawiz03auth.xhp b/source/text/shared/explorer/database/dabawiz03auth.xhp
index eb5c5d70b0..db0b467c8c 100644
--- a/source/text/shared/explorer/database/dabawiz03auth.xhp
+++ b/source/text/shared/explorer/database/dabawiz03auth.xhp
@@ -32,11 +32,16 @@
</meta>
<body>
<paragraph role="heading" id="par_idN1053A" xml-lang="en-US" level="1" l10n="NEW">Authentication</paragraph>
-<paragraph role="paragraph" id="par_idN1053E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Some databases require a user name and password.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1053E" xml-lang="en-US" l10n="NEW">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"/>
<paragraph role="heading" id="par_idN10541" xml-lang="en-US" level="2" l10n="NEW">User name</paragraph>
<paragraph role="paragraph" id="par_idN10545" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the user name to access the database.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/authentificationpage/passRequiredCheckbutton" id="bm_id6467787" localize="false"/>
<paragraph role="heading" id="par_idN10548" xml-lang="en-US" level="3" l10n="NEW">Password required</paragraph>
<paragraph role="paragraph" id="par_idN1054C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to prompt a user for a password to access the database.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/authentificationpage/testConnectionButton" id="bm_id6467788" localize="false"/>
+<paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="3">Test Connection</paragraph>
+<paragraph role="paragraph" id="par_idN10546" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Check if the configured connection can be used to access the database.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN1054F" xml-lang="en-US" l10n="CHG"><link href="text/shared/explorer/database/dabawiz02.xhp">Save and proceed</link></paragraph>
<paragraph role="paragraph" id="par_idN10566" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
</body>