[Libreoffice-commits] help.git: source/text
Olivier Hallot (via logerrit)
logerrit at kemper.freedesktop.org
Mon Apr 20 23:55:05 UTC 2020
source/text/shared/explorer/database/dabawiz00.xhp | 5 +
source/text/shared/explorer/database/dabawiz01.xhp | 18 +++---
source/text/shared/explorer/database/dabawiz02mysql.xhp | 44 +++++++++++++---
3 files changed, 48 insertions(+), 19 deletions(-)
New commits:
commit 8bc7adda21caae983a74b72dbbc23bc805de0580
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Mon Apr 20 17:53:28 2020 -0300
Commit: Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Tue Apr 21 01:54:46 2020 +0200
tdf#132227 Add MySQL direct connection help page
Change-Id: Icc0393d89799349701136d6b8e98519732ec0fa5
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/92601
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
diff --git a/source/text/shared/explorer/database/dabawiz00.xhp b/source/text/shared/explorer/database/dabawiz00.xhp
index 043d915ab..396b18c62 100644
--- a/source/text/shared/explorer/database/dabawiz00.xhp
+++ b/source/text/shared/explorer/database/dabawiz00.xhp
@@ -32,11 +32,12 @@
<bookmark_value>Database Wizard (Base)</bookmark_value>
<bookmark_value>databases; formats (Base)</bookmark_value>
<bookmark_value>MySQL databases (Base)</bookmark_value>
+<bookmark_value>MariaDB databases (Base)</bookmark_value>
<bookmark_value>dBASE; database settings (Base)</bookmark_value>
<bookmark_value>spreadsheets;as databases (base)</bookmark_value>
</bookmark><comment>mw added "(Base)" to all entries</comment>
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generalpagewizard/PageGeneral" id="bm_id3952452" localize="false"/>
-<paragraph role="heading" id="par_idN105B4" xml-lang="en-US" level="1"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
+<h1 id="par_idN105B4"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></h1>
<paragraph role="paragraph" id="par_idN105C4" xml-lang="en-US"><ahelp hid="." visibility="hidden">The Database Wizard creates a database file that contains information about a database.</ahelp><comment>UFI: extended help text must no longer contain switches or links</comment></paragraph>
<paragraph role="paragraph" id="par_id9856563" xml-lang="en-US">The Database Wizard creates a <link href="text/shared/explorer/database/dabadoc.xhp">database file</link> that contains information about a database.</paragraph>
</section>
@@ -64,7 +65,7 @@
<paragraph role="paragraph" id="par_idN1070F" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02dbase.xhp">Set up dBASE connection</link></paragraph>
<paragraph role="paragraph" id="par_idN1063D" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02jdbc.xhp">Set up JDBC connection</link></paragraph>
<paragraph role="paragraph" id="par_idN1064C" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02oracle.xhp">Set up Oracle database connection</link></paragraph>
-<paragraph role="paragraph" id="par_idN1065B" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02mysql.xhp">MySQL settings</link></paragraph>
+<embed href="text/shared/explorer/database/dabawiz02mysql.xhp#mysql"/>
<paragraph role="paragraph" id="par_idN1066A" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02odbc.xhp">ODBC settings</link></paragraph>
<paragraph role="paragraph" id="par_idN10679" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02spreadsheet.xhp">Set up Spreadsheet connection</link></paragraph>
<embed href="text/shared/00/00000001.xhp#abbrechen"/>
diff --git a/source/text/shared/explorer/database/dabawiz01.xhp b/source/text/shared/explorer/database/dabawiz01.xhp
index d11502072..eae608cda 100644
--- a/source/text/shared/explorer/database/dabawiz01.xhp
+++ b/source/text/shared/explorer/database/dabawiz01.xhp
@@ -30,32 +30,32 @@
<section id="dabaselection">
<bookmark xml-lang="en-US" branch="index" id="bm_id2082583"><bookmark_value>databases; connecting (Base)</bookmark_value>
</bookmark>
-<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1"><link href="text/shared/explorer/database/dabawiz01.xhp">Select Database</link></paragraph>
+<h1 id="par_idN1054D"><link href="text/shared/explorer/database/dabawiz01.xhp">Select Database</link></h1>
<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US"><ahelp hid=".">Creates a new database, opens a database file, or connects to an existing database.</ahelp></paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generalpagewizard/createDatabase" id="bm_id2482985" localize="false"/>
-<paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="2">Create a new database</paragraph>
+<h2 id="par_idN10585">Create a new database</h2>
<paragraph role="paragraph" id="par_idN10589" xml-lang="en-US"><ahelp hid=".">Select to create a new database. </ahelp>This option uses the HSQL database engine with default settings. The final page of the wizard appears next.</paragraph>
<paragraph role="paragraph" id="par_id8584246" xml-lang="en-US"><link href="http://hsqldb.org/">External web page about HSQL</link>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generalpagewizard/openExistingDatabase" id="bm_id2400585" localize="false"/>
-<paragraph role="heading" id="par_idN105F9" xml-lang="en-US" level="2">Open an existing database file</paragraph>
+<h2 id="par_idN105F9">Open an existing database file</h2>
<paragraph role="paragraph" id="par_idN105FD" xml-lang="en-US"><ahelp hid=".">Select to open a database file from a list of recently used files or from a file selection dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generalpagewizard/docListBox" id="bm_id5958128" localize="false"/>
-<paragraph role="heading" id="par_idN10614" xml-lang="en-US" level="3">Recently used</paragraph>
+<h3 id="par_idN10614">Recently used</h3>
<paragraph role="paragraph" id="par_idN10618" xml-lang="en-US"><ahelp hid=".">Select a database file to open from the list of recently used files. Click Finish to open the file immediately and to exit the wizard.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generalpagewizard/openDatabase" id="bm_id6427198" localize="false"/>
-<paragraph role="heading" id="par_idN1062F" xml-lang="en-US" level="3">Open</paragraph>
+<h3 id="par_idN1062F">Open</h3>
<paragraph role="paragraph" id="par_idN10633" xml-lang="en-US"><ahelp hid=".">Opens a file selection dialog where you can select a database file. Click Open or OK in the file selection dialog to open the file immediately and to exit the wizard.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generalpagewizard/connectDatabase" id="bm_id5028229" localize="false"/>
-<paragraph role="heading" id="par_idN1058C" xml-lang="en-US" level="2">Connect to an existing database</paragraph>
+<h2 id="par_idN1058C">Connect to an existing database</h2>
<paragraph role="paragraph" id="par_idN10590" xml-lang="en-US"><ahelp hid=".">Select to create a database document for an existing database connection.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generalpagewizard/datasourceType" id="bm_id763267" localize="false"/>
-<paragraph role="heading" id="par_idN10593" xml-lang="en-US" level="3">Database type</paragraph>
+<h3 id="par_idN10593">Database type</h3>
<paragraph role="paragraph" id="par_idN10597" xml-lang="en-US"><ahelp hid=".">Select the database type for the existing database connection.</ahelp></paragraph>
-<paragraph role="note" id="par_idN1059A" xml-lang="en-US">The Outlook, Evolution, KDE Address Book, and Seamonkey database types do not need additional information. For other database types, the wizard contains additional pages to specify the required information.</paragraph>
+<note id="par_idN1059A">The Outlook, Evolution, KDE Address Book, and Seamonkey database types do not need additional information. For other database types, the wizard contains additional pages to specify the required information.</note>
<paragraph role="paragraph" id="par_idN10611" xml-lang="en-US">The next wizard page is one of the following pages:</paragraph>
<embed href="text/shared/explorer/database/dabawiz02.xhp#nextsteps"/>
<paragraph role="paragraph" id="par_idN1061C" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02text.xhp">Set up text file connection</link></paragraph>
@@ -64,7 +64,7 @@
<paragraph role="paragraph" id="par_idN10658" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02ado.xhp">Set up ADO connection</link></paragraph>
<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02jdbc.xhp">Set up JDBC connection</link></paragraph>
<paragraph role="paragraph" id="par_idN10676" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02oracle.xhp">Set up Oracle database connection</link></paragraph>
-<paragraph role="paragraph" id="par_idN10685" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02mysql.xhp">MySQL settings</link></paragraph>
+<embed href="text/shared/explorer/database/dabawiz02mysql.xhp#mysql"/>
<paragraph role="paragraph" id="par_idN10694" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02odbc.xhp">ODBC settings</link></paragraph>
<paragraph role="paragraph" id="par_idN106A3" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02spreadsheet.xhp">Set up Spreadsheet connection</link></paragraph>
</body>
diff --git a/source/text/shared/explorer/database/dabawiz02mysql.xhp b/source/text/shared/explorer/database/dabawiz02mysql.xhp
index 96fd6cac6..4555a5976 100644
--- a/source/text/shared/explorer/database/dabawiz02mysql.xhp
+++ b/source/text/shared/explorer/database/dabawiz02mysql.xhp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
* This file is part of the LibreOffice project.
*
@@ -18,8 +18,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
+
+
<meta>
<topic id="textsharedexplorerdatabasedabawiz02mysqlxml" indexer="include">
<title id="tit" xml-lang="en-US">MySQL Connection</title>
@@ -27,14 +27,42 @@
</topic>
</meta>
<body><comment>** Expression is faulty **</comment>
-<paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1"><variable id="mysql"><link href="text/shared/explorer/database/dabawiz02mysql.xhp">MySQL Connection</link>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_idN1054D" xml-lang="en-US"><ahelp hid=".">Specifies the options for MySQL databases.</ahelp><comment>text copied from shared\explorer\database\11120000</comment></paragraph>
+<bookmark xml-lang="en-US" branch="index" id="bm_id861587404584956">
+<bookmark_value>MariaDB settings (base)</bookmark_value>
+<bookmark_value>MySQL settings (base)</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/mysqlnativesettings/MysqlNativeSettings" id="bm_id921587413082830" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/dbwizmysqlintropage/DBWizMysqlIntroPage" id="bm_id181587415238853" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/dbwizmysqlintropage/directly" id="bm_id891587415338612" localize="false"/>
+<h1 id="par_idN10549"><variable id="mysql"><link href="text/shared/explorer/database/dabawiz02mysql.xhp">MariaDB and MySQL Connection</link></variable></h1>
+<paragraph role="paragraph" id="par_idN1054D" xml-lang="en-US"><ahelp hid=".">Specifies the options for MariaDB and MySQL databases.</ahelp><comment>text copied from shared\explorer\database\11120000</comment></paragraph>
+<h2 id="hd_id661587405298284">Direct Connection for MariaDB and MySQL databases</h2>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/mysqlnativesettings/dbname" id="bm_id461587412947601" localize="false"/>
+<h3 id="hd_id321587405303769">Database name</h3>
+<paragraph role="paragraph" id="par_id371587405314376">Enter the name of the MariaDB or MySQL database. Ask your database administrator for the correct name.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/mysqlnativesettings/server" id="bm_id561587412955495" localize="false"/>
+<h3 id="hd_id561587405334695">Server URL</h3>
+<paragraph role="paragraph" id="par_id521587405341138">Enter the URL for the database server. This is the name of the machine that runs the MariaDB or MYSQL database. You can also replace hostname with the IP address of the server.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/mysqlnativesettings/port" id="bm_id61587412969905" localize="false"/>
+<h3 id="hd_id171587405349438">Port number</h3>
+<paragraph role="paragraph" id="par_id1001587405358390">Enter the port number for the database server. Ask your database administrator for the correct port address. The default port number for MySQL or MariaDB databases is 3306.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/mysqlnativesettings/socket" id="bm_id971587412977058" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/mysqlnativesettings/namedpipe" id="bm_id31587412982787" localize="false"/>
+<switch select="sys">
+<case select="WIN">
+<h3 id="hd_id121587407845730">Named Pipe</h3>
+<paragraph role="paragraph" id="par_id941587407987180">If the MariaDB or MySQL database is to be acessed by a named pipe, enter it's name.</paragraph>
+</case>
+<default>
+<h3 id="hd_id161587405553671">Socket</h3>
+<paragraph role="paragraph" id="par_id161587405561472">If the MariaDb or MySQL database is to be acessed by a socket, enter the socket ID.</paragraph>
+</default>
+</switch>
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/dbwizmysqlintropage/odbc" id="bm_id6776940" localize="false"/>
-<paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="2">Connect using ODBC (Open Database Connectivity)</paragraph>
+<h2 id="par_idN10562">Connect using ODBC (Open Database Connectivity)</h2>
<paragraph role="paragraph" id="par_idN10566" xml-lang="en-US"><ahelp hid=".">Connects to an existing ODBC data source that was set on a system level.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/dbwizmysqlintropage/jdbc" id="bm_id4285409" localize="false"/>
-<paragraph role="heading" id="par_idN10569" xml-lang="en-US" level="2">Connect using JDBC (Java Database Connectivity)</paragraph>
+<h2 id="par_idN10569">Connect using JDBC (Java Database Connectivity)</h2>
<paragraph role="paragraph" id="par_idN1056D" xml-lang="en-US"><ahelp hid=".">Connects to an existing JDBC data source that was set on a system level.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN10570" xml-lang="en-US">The next wizard page depends on your choice of ODBC or JDBC:</paragraph>
<paragraph role="paragraph" id="par_idN10573" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02odbc.xhp">ODBC Connection</link></paragraph>
More information about the Libreoffice-commits
mailing list