[Libreoffice-commits] help.git: source/text

Sun Jan 8 22:00:34 UTC 2017

source/text/shared/explorer/database/dabawiz02jdbc.xhp |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

New commits:
commit fe71a0de7fa240513f58a6993d02016f1774728f
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date:   Sat Jan 7 15:51:51 2017 +0100

    Fix bookmarks and ahelps on DB Wizard JDBC page
    
    Change-Id: Id50171d63cadec967d31100dca940902f2a40029
    Reviewed-on: https://gerrit.libreoffice.org/32832
    Reviewed-by: Gabor Kelemen <kelemeng at ubuntu.com>
    Tested-by: Gabor Kelemen <kelemeng at ubuntu.com>

diff --git a/source/text/shared/explorer/database/dabawiz02jdbc.xhp b/source/text/shared/explorer/database/dabawiz02jdbc.xhp
index 149de2a..2e8377d 100644
--- a/source/text/shared/explorer/database/dabawiz02jdbc.xhp
+++ b/source/text/shared/explorer/database/dabawiz02jdbc.xhp
@@ -31,7 +31,9 @@
 <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3726920"><bookmark_value>JDBC; databases (Base)</bookmark_value>
 <bookmark_value>databases; JDBC (Base)</bookmark_value>
-</bookmark><comment>mw copied 2 index entries from shared/explorer/database/11110000.xhp</comment><paragraph role="heading" id="par_idN105FC" xml-lang="en-US" level="1" l10n="NEW"><variable id="jdbc"><link href="text/shared/explorer/database/dabawiz02jdbc.xhp">JDBC Connection</link>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/jdbcconnectionpage/JDBCConnectionPage" id="bm_id6293219" localize="false"/>
+<paragraph role="heading" id="par_idN105FC" xml-lang="en-US" level="1" l10n="NEW"><variable id="jdbc"><link href="text/shared/explorer/database/dabawiz02jdbc.xhp">JDBC Connection</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_idN10600" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the options to access a <link href="text/shared/00/00000005.xhp#jdbc" name="JDBC">JDBC</link> database.</ahelp><comment>copied text from shared\explorer\database\11110000</comment></paragraph>
 <paragraph role="heading" id="par_idN10623" xml-lang="en-US" level="2" l10n="NEW">JDBC Examples</paragraph>
@@ -73,18 +75,19 @@
 <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/DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL" id="bm_id6293221" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/jdbcconnectionpage/browseurl" id="bm_id6293221" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/DBACCESS_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>
+<paragraph role="paragraph" id="par_idN106A4" xml-lang="en-US" l10n="NEW"><ahelp hid=".">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/dbaccess/ui/connectionpage/javaDriverLabel" id="bm_id3153970" localize="false"/>
-<!-- removed HID 852248660 -->
-<!-- removed HID 852330580 --><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="dbaccess/ui/connectionpage/javaDriverLabel">Enter the name of the JDBC driver.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/jdbcconnectionpage/jdbcEntry" id="bm_id3153969" 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=".">Enter the name of the JDBC driver.</ahelp></paragraph>
 <section id="classpath">
 <paragraph role="warning" id="par_id7953733" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME</emph>
 <emph>- Advanced</emph>, and click the <emph>Class Path</emph> button. After you add the path information, restart <item type="productname">%PRODUCTNAME</item>.</paragraph>
 </section>
-<!-- removed HID 852251216 --><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>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/jdbcconnectionpage/jdbcButton" id="bm_id3153971" localize="false"/>
+<paragraph role="heading" id="par_idN106CE" xml-lang="en-US" level="2">Test Class</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>
