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

Mon Jun 24 06:22:32 UTC 2019

source/text/shared/explorer/database/dabawiz02oracle.xhp |   33 ++++-----------
 1 file changed, 10 insertions(+), 23 deletions(-)

New commits:
commit 9a704ed71319e6e6179dc756bd686cddf1d80a55
Author:     Gabor Kelemen <kelemeng at gnome.hu>
AuthorDate: Sat Jun 22 20:43:03 2019 +0200
Commit:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
CommitDate: Mon Jun 24 08:22:12 2019 +0200

    Update Base - Oracle connection page
    
    Ahelp and bookmark fixes, also adapt to current UI
    
    Change-Id: I278b1df6168515c06e034f8528778c257b892127
    Reviewed-on: https://gerrit.libreoffice.org/74576
    Tested-by: Jenkins
    Reviewed-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>

diff --git a/source/text/shared/explorer/database/dabawiz02oracle.xhp b/source/text/shared/explorer/database/dabawiz02oracle.xhp
index a3ffd0ff5..8911c77c2 100644
--- a/source/text/shared/explorer/database/dabawiz02oracle.xhp
+++ b/source/text/shared/explorer/database/dabawiz02oracle.xhp
@@ -30,6 +30,7 @@
 </history>
 </meta>
 <body>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/specialjdbcconnectionpage/SpecialJDBCConnectionPage" id="bm_id7325353" localize="false"/>
 <bookmark xml-lang="en-US" branch="index" id="bm_id5900753"><bookmark_value>Oracle databases (base)</bookmark_value>
 </bookmark><comment>mw added one index entry</comment>
 <paragraph role="heading" id="par_idN105A4" xml-lang="en-US" level="1">Oracle Database Connection</paragraph>
@@ -41,33 +42,19 @@
 <paragraph role="paragraph" id="par_idN105D4" xml-lang="en-US">On UNIX, ensure that the Oracle database client is installed with JDBC support. The JDBC driver class for the Solaris Oracle client version 8.x is located in the <Oracle client>/product/jdbc/lib/classes111.zip directory. You can also download the latest version of the driver from the Oracle web site.</paragraph>
 </case>
 </switch>
-<paragraph role="paragraph" id="par_idN105EA" xml-lang="en-US"><ahelp hid=".">In the <emph>Data source URL</emph> box, enter the location of the Oracle database server. The syntax of the URL depends on the database type. See the documentation that came with the JDBC driver for more information.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN105F1" xml-lang="en-US">For an Oracle database, the syntax of the URL is:</paragraph>
-<paragraph role="example" id="par_idN105F4" xml-lang="en-US">oracle:thin:@hostname:port:database_name</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_idN105FD" xml-lang="en-US">hostname is the name of the machine that runs the Oracle database. You can also replace hostname with the IP address of the server.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN10601" xml-lang="en-US">port is the port where the Oracle database listens. Ask your database administrator for the correct port address.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_idN10605" xml-lang="en-US">database_name is the name of the Oracle database. Ask your database administrator for the correct name.</paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER" id="bm_id6442152" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/specialjdbcconnectionpage/dbNameEntry" id="bm_id6442152" localize="false"/>
 <paragraph role="heading" id="par_idN10608" xml-lang="en-US" level="2">Name of the Oracle database</paragraph>
-<paragraph role="paragraph" id="par_idN1060C" xml-lang="en-US"><ahelp hid=".">Enter the name of the Oracle database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS" id="bm_id7636036" localize="false"/>
+<paragraph role="paragraph" id="par_idN1060C" xml-lang="en-US"><ahelp hid=".">Enter the name of the Oracle database. Ask your database administrator for the correct name.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/specialjdbcconnectionpage/hostNameEntry" id="bm_id7636036" localize="false"/>
 <paragraph role="heading" id="par_idN1060F" xml-lang="en-US" level="2">Server URL</paragraph>
-<paragraph role="paragraph" id="par_idN10613" xml-lang="en-US"><ahelp hid=".">Enter the URL for the database server. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT" id="bm_id7325357" localize="false"/>
+<paragraph role="paragraph" id="par_idN10613" xml-lang="en-US"><ahelp hid=".">Enter the URL for the database server. This is the name of the machine that runs the Oracle database. You can also replace hostname with the IP address of the server.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/specialjdbcconnectionpage/portNumEntry" id="bm_id7325357" localize="false"/>
 <paragraph role="heading" id="par_idN10616" xml-lang="en-US" level="2">Port number</paragraph>
-<paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US"><ahelp hid=".">Enter the port number for the database server.</ahelp></paragraph>
-<!-- removed HID 852231276 -->
+<paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US"><ahelp hid=".">Enter the port number for the database server. Ask your database administrator for the correct port address.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/specialjdbcconnectionpage/jdbcDriverEntry" id="bm_id7325358" localize="false"/>
 <paragraph role="heading" id="par_idN1061D" xml-lang="en-US" level="2">Oracle JDBC Driver Class</paragraph>
-<paragraph role="paragraph" id="par_idN10621" xml-lang="en-US"><ahelp hid="dbaccess/ui/connectionpage/javaDriverLabel">Enter the name of the JDBC driver.</ahelp></paragraph>
-<!-- removed HID 852234832 -->
+<paragraph role="paragraph" id="par_idN10621" xml-lang="en-US"><ahelp hid=".">Enter the name of the JDBC driver.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/specialjdbcconnectionpage/testDriverButton" id="bm_id732535" localize="false"/>
 <paragraph role="heading" id="par_idN10630" xml-lang="en-US" level="2">Test Class</paragraph>
 <paragraph role="paragraph" id="par_idN10634" xml-lang="en-US"><ahelp hid=".">Tests the connection with the current settings.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10637" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz03auth.xhp">Authentication</link></paragraph>
