tdf#153940 New Help page for Firebird external connection

* New help page by Juan C. Sanz
* Connection Help pages refactoring by ohallot.

Change-Id: I344644473985df809d2bc31be42b8a21467771f9
Signed-off-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/148203
Tested-by: Jenkins

7 files changed, 109 insertions, 28 deletions

diff --git a/source/text/sdatabase/dabawiz00.xhp b/source/text/sdatabase/dabawiz00.xhp
index b8b001787f..59240fdfcb 100644
--- a/source/text/sdatabase/dabawiz00.xhp
+++ b/source/text/sdatabase/dabawiz00.xhp
@@ -37,7 +37,9 @@
 <bookmark_value>dBASE; database settings (Base)</bookmark_value>
 <bookmark_value>jdbc; database settings (Base)</bookmark_value>
 <bookmark_value>odbc; database settings (Base)</bookmark_value>
-<bookmark_value>spreadsheets;as databases (base)</bookmark_value>
+<bookmark_value>Firebird; database settings (Base)</bookmark_value>
+<bookmark_value>PostgreSQL; 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"/>
 <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generalpagewizard/@@nowidget@@" id="bm_id4952452" localize="false"/>
@@ -51,19 +53,17 @@
 <embed href="text/sdatabase/dabawiz02.xhp#nextsteps"/>
 <embed href="text/sdatabase/dabawiz02connection.xhp#conn_settings"/>
 <section id="connection_types">
-<paragraph role="paragraph" id="par_idN1066A" xml-lang="en-US"><link href="text/sdatabase/dabawiz02odbc.xhp">ODBC settings</link></paragraph>
-<paragraph role="paragraph" id="par_idN105F2" xml-lang="en-US"><link href="text/sdatabase/dabawiz02text.xhp">Set up text file connection</link></paragraph>
-<switch select="sys">
-<case select="WIN">
-<paragraph role="paragraph" id="par_idN10601" xml-lang="en-US"><link href="text/sdatabase/dabawiz02access.xhp">Set up Microsoft Access connection</link></paragraph>
-<paragraph role="paragraph" id="par_idN1062E" xml-lang="en-US"><link href="text/sdatabase/dabawiz02ado.xhp">Set up ADO connection</link></paragraph>
-</case>
-</switch>
-<paragraph role="paragraph" id="par_idN1070F" xml-lang="en-US"><link href="text/sdatabase/dabawiz02dbase.xhp">Set up dBASE connection</link></paragraph>
-<paragraph role="paragraph" id="par_idN1063D" xml-lang="en-US"><link href="text/sdatabase/dabawiz02jdbc.xhp">Set up JDBC connection</link></paragraph>
-<paragraph role="paragraph" id="par_idN1064C" xml-lang="en-US"><link href="text/sdatabase/dabawiz02oracle.xhp">Set up Oracle database connection</link></paragraph>
-<paragraph role="paragraph" id="par_idN1064F" xml-lang="en-US"><link href="text/sdatabase/dabawiz02mysql.xhp">Set up MariaDB and MySQL connection</link></paragraph>
-<paragraph role="paragraph" id="par_idN10679" xml-lang="en-US"><link href="text/sdatabase/dabawiz02spreadsheet.xhp">Set up Spreadsheet connection</link></paragraph>
+    <embed href="text/sdatabase/dabawiz02odbc.xhp#odbc"/>
+    <embed href="text/sdatabase/dabawiz02text.xhp#text"/>
+    <embed href="text/sdatabase/dabawiz02access.xhp#access"/>
+    <embed href="text/sdatabase/dabawiz02ado.xhp#ado"/>
+    <embed href="text/sdatabase/dabawiz02dbase.xhp#dbase"/>
+    <embed href="text/sdatabase/dabawiz02firebird.xhp#h1"/>
+    <embed href="text/sdatabase/dabawiz02jdbc.xhp#jdbc"/>
+    <embed href="text/sdatabase/dabawiz02oracle.xhp#Oracle"/>
+    <embed href="text/sdatabase/dabawiz02mysql.xhp#mysql"/>
+    <embed href="text/sdatabase/dabawiz02pgsql.xhp#pgsqlh1"/>
+    <embed href="text/sdatabase/dabawiz02spreadsheet.xhp#spreadsheet"/>
 </section>
 <embed href="text/shared/00/00000001.xhp#back"/>
 <embed href="text/shared/00/00000001.xhp#next"/>
diff --git a/source/text/sdatabase/dabawiz01.xhp b/source/text/sdatabase/dabawiz01.xhp
index 0a8b98b8ec..bd37152ac6 100644
--- a/source/text/sdatabase/dabawiz01.xhp
+++ b/source/text/sdatabase/dabawiz01.xhp
@@ -57,15 +57,7 @@
 <paragraph role="paragraph" id="par_idN10597" xml-lang="en-US"><ahelp hid=".">Select the database type for the existing database connection.</ahelp></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/sdatabase/dabawiz00.xhp#connection_types"/>
 <embed href="text/sdatabase/dabawiz02.xhp#nextsteps"/>
-<paragraph role="paragraph" id="par_idN1061C" xml-lang="en-US"><link href="text/sdatabase/dabawiz02text.xhp">Set up text file connection</link></paragraph>
-<paragraph role="paragraph" id="par_idN1062B" xml-lang="en-US"><link href="text/sdatabase/dabawiz02access.xhp">Set up Microsoft Access or Microsoft Access 2007 connection</link></paragraph>
-<paragraph role="paragraph" id="par_idN10658" xml-lang="en-US"><link href="text/sdatabase/dabawiz02ado.xhp">Set up ADO connection</link></paragraph>
-<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US"><link href="text/sdatabase/dabawiz02jdbc.xhp">Set up JDBC connection</link></paragraph>
-<paragraph role="paragraph" id="par_idN10676" xml-lang="en-US"><link href="text/sdatabase/dabawiz02oracle.xhp">Set up Oracle database connection</link></paragraph>
-<embed href="text/sdatabase/dabawiz02mysql.xhp#mysql"/>
-<embed href="text/sdatabase/dabawiz02pgsql.xhp#pgsqlh1"/>
-<paragraph role="paragraph" id="par_idN10694" xml-lang="en-US"><link href="text/sdatabase/dabawiz02odbc.xhp">ODBC settings</link></paragraph>
-<paragraph role="paragraph" id="par_idN106A3" xml-lang="en-US"><link href="text/sdatabase/dabawiz02spreadsheet.xhp">Set up Spreadsheet connection</link></paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/sdatabase/dabawiz02access.xhp b/source/text/sdatabase/dabawiz02access.xhp
index 7eda1c5aa9..66873122f1 100644
--- a/source/text/sdatabase/dabawiz02access.xhp
+++ b/source/text/sdatabase/dabawiz02access.xhp
@@ -26,8 +26,8 @@
 <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id2755516"><bookmark_value>Access databases (base)</bookmark_value>
 <bookmark_value>Microsoft Office;Access databases (base)</bookmark_value>
-</bookmark><comment>mw added 2 new index entries</comment><h1 id="par_idN1053D"><variable id="access"><link href="text/sdatabase/dabawiz02access.xhp">Microsoft Access Connection</link>
-</variable></h1>
+</bookmark><comment>mw added 2 new index entries</comment>
+<h1 id="par_idN1053D"><variable id="access"><link href="text/sdatabase/dabawiz02access.xhp">Microsoft Access Connection</link></variable></h1>
 <paragraph role="paragraph" id="par_idN10541" xml-lang="en-US"><ahelp hid=".">Specifies the settings for importing a database file in Microsoft Access or Access 2007 format.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id1142772" xml-lang="en-US">See also the English Wiki page <link href="https://wiki.documentfoundation.org/MSA-Base_Faq">https://wiki.documentfoundation.org/MSA-Base_Faq</link>.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION" id="bm_id627155" localize="false"/><h2 id="par_idN10544">Microsoft Access database file</h2>
diff --git a/source/text/sdatabase/dabawiz02firebird.xhp b/source/text/sdatabase/dabawiz02firebird.xhp
new file mode 100644
index 0000000000..b2206ef395
--- /dev/null
+++ b/source/text/sdatabase/dabawiz02firebird.xhp
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+    <!--
+    * This file is part of the %PRODUCTNAME  project.
+    *
+    * This Source Code Form is subject to the terms of the Mozilla Public
+    * License, v. 2.0. If a copy of the MPL was not distributed with this
+    * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    *
+    -->
+
+<meta>
+    <topic id="textsdatabasedabawiz02firebirdxhp" indexer="include" status="PUBLISH">
+        <title id="tit" xml-lang="en-US">Firebird Connection</title>
+        <filename>/text/sdatabase/dabawiz02firebird.xhp</filename>
+    </topic>
+</meta>
+<body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id641677867638107">
+<bookmark_value>Firebird server;setup connection</bookmark_value>
+<bookmark_value>Firebird connection</bookmark_value>
+<bookmark_value>database connection;Firebird server</bookmark_value>
+</bookmark>
+
+<section id="firebirdconnection">
+    <h1 id="hd_id51677867293715"><variable id="h1"><link href="text/sdatabase/dabawiz02firebird.xhp">Firebird Connection</link></variable></h1>
+    <paragraph id="par_id401677867293719" role="paragraph" xml-lang="en-US">Specifies the options for connecting to Firebird external databases.</paragraph>
+</section>
+
+<h2 id="hd_id251677867849494">Creating a new Firebird database file</h2>
+<list type="ordered">
+    <listitem>
+        <paragraph id="par_id101697868070614"  role="listitem">Choose <menuitem>File - New - Database</menuitem> and select <emph>Connect to an existing database</emph>. Click on Next.</paragraph>
+    </listitem>
+    <listitem>
+        <paragraph id="par_id301677867908874"  role="listitem">Click on Create. The Save as dialog opens. Enter a suitable name and location for the database file, and click on Save. The path of the new file is displayed  in the wizard text box. Click Next.</paragraph>
+    </listitem>
+    <listitem>
+        <paragraph id="par_id161677867944534"  role="listitem">Optionally, enter your username and password. Click on Next.</paragraph>
+    </listitem>
+    <listitem>
+        <paragraph id="par_id151677867957065"  role="listitem">Decide your preferred options about registered database and what to do with database once saved, and click Finish. Proceed entering a name to the new %PRODUCTNAME Base file.</paragraph>
+    </listitem>
+</list>
+    <note id="par_id401677867921758">This name is the name of the new Firebird database file (*.fdb), not the name of the %PRODUCTNAME Base (*.odb) file.</note>
+<h2 id="hd_id361677867976296">Connect to an existing Firebird database file</h2>
+<list type="ordered">
+    <listitem>
+        <paragraph id="par_id101677868070614"  role="listitem">Choose <menuitem>File - New - Database</menuitem> and select <emph>Connect to an existing database</emph>. Click on Next</paragraph>
+    </listitem>
+    <listitem>
+        <paragraph id="par_id911677870523239"  role="listitem">Click on Browse and navigate to select the Firebird file (*.fdb). Click on Open button, the complete URL to the database file is displayed in the text box. Click on Next.</paragraph>
+    </listitem>
+    <listitem>
+        <paragraph id="par_id761677868087380"  role="listitem">Optionally, enter your username and password. Click on Next.</paragraph>
+    </listitem>
+    <listitem>
+        <paragraph id="par_id781677868096809"  role="listitem">Decide your preferred options about database registration and what to do with database once saved, and click Finish.  Proceed entering a name to the new %PRODUCTNAME Base file.</paragraph>
+    </listitem>
+</list>
+<h2 id="hd_id101677868045879">Connect directly to a Firebird server</h2>
+<paragraph role="paragraph" id="par_id691677869556047">In addition to connections via JDBC and ODBC, you can connect to a Firebird server via the internal Firebird driver:</paragraph>
+<list type="ordered">
+    <listitem>
+        <paragraph id="par_id105677868070614"  role="listitem">Choose <menuitem>File - New - Database</menuitem> and select <emph>Connect to an existing database</emph>. Click on Next</paragraph>
+    </listitem>
+    <listitem>
+        <paragraph id="par_id411677868640685"  role="listitem">Manually enter the database connection URL in the text box. The pattern is <literal>&lt;servername&gt;/&lt;port&gt;:&lt;path_to_the_database&gt;</literal>, for example:</paragraph>
+        <paragraph id="par_id401677868302585"  role="listitem"><literal>server1/3050:C:/data/mydatabase.fdb</literal> (note the “/” although it is a Windows path)</paragraph>
+        <paragraph id="par_id11677868316366"  role="listitem"><literal>server1:C:/data/mydatabase.fdb</literal> (default port, Windows path)</paragraph>
+        <paragraph id="par_id381677868323697"  role="listitem"><literal>localhost:/data/mydatabase.fdb</literal> (localhost server, default port, Linux path)</paragraph>
+        <paragraph id="par_id481677868332818"  role="listitem"><literal>server1:mydata</literal> (default port, registered database)</paragraph>
+    </listitem>
+    <listitem>
+        <paragraph id="par_id481677868353090"  role="listitem">Click on Next.</paragraph>
+    </listitem>
+    <listitem>
+        <paragraph id="par_id351677868361836"  role="listitem">Provide a suitable username and password required for the server connection. Test the connection (recommended) and fix the issues, if any. Click Next.</paragraph>
+    </listitem>
+    <listitem>
+        <paragraph id="par_id601677868371635"  role="listitem">Decide about registered database and what to do with database once saved, and click Finish.  Proceed entering a name to the new %PRODUCTNAME Base file.</paragraph>
+    </listitem>
+</list>
+    <note id="par_id11677868344526">You can add some other options to the database URL, like charset or role. See Firebird documentation to know about</note>
+<section id="relatedtopics">
+    <paragraph role="paragraph" id="par_id301677871783123"><link href="https://www.firebirdsql.org/en/documentation/">Firebird documentation</link></paragraph>
+</section>
+</body>
+</helpdocument>
diff --git a/source/text/sdatabase/dabawiz02oracle.xhp b/source/text/sdatabase/dabawiz02oracle.xhp
index 988bc8fc10..f8ad16a417 100644
--- a/source/text/sdatabase/dabawiz02oracle.xhp
+++ b/source/text/sdatabase/dabawiz02oracle.xhp
@@ -30,7 +30,7 @@
 <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>
-<h1 id="par_idN105A4">Oracle Database Connection</h1>
+<h1 id="par_idN105A4"><variable id="Oracle"><link href="text/sdatabase/dabawiz02oracle.xhp">Oracle Database Connection</link></variable></h1>
 <paragraph role="paragraph" id="par_idN105A8" xml-lang="en-US"><ahelp hid=".">Specifies the options to access an Oracle database.</ahelp><comment>copied text from shared\explorer\database\11110000</comment></paragraph>
 <h2 id="par_idN105BD">Oracle database</h2>
 <paragraph role="paragraph" id="par_idN105C1" xml-lang="en-US">You can use a JDBC driver to access an Oracle database from Solaris or Linux. To access the database from Windows, you need an ODBC driver.</paragraph>
diff --git a/source/text/sdatabase/dabawiz02spreadsheet.xhp b/source/text/sdatabase/dabawiz02spreadsheet.xhp
index 3980a26321..8e7ff935f9 100644
--- a/source/text/sdatabase/dabawiz02spreadsheet.xhp
+++ b/source/text/sdatabase/dabawiz02spreadsheet.xhp
@@ -28,7 +28,7 @@
 </meta>
 <body><comment>** Expression is faulty **</comment>
 <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/dbwizspreadsheetpage/DBWizSpreadsheetPage" id="bm_id5975217" localize="false"/>
-<h1 id="par_idN1053A">Set up Spreadsheet connection</h1>
+<h1 id="par_idN1053A"><variable id="spreadsheet"><link href="text/sdatabase/dabawiz02spreadsheet.xhp">Spreadsheet Connection</link></variable></h1>
 <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/dbwizspreadsheetpage/browseurl" id="bm_id5975218" localize="false"/>
 <h2 id="par_idN1053E">Location and file name</h2>
 <paragraph role="paragraph" id="par_idN10542" xml-lang="en-US"><ahelp hid=".">Enter the path and file name to the spreadsheet file.</ahelp></paragraph>
diff --git a/source/text/sdatabase/dabawiz02text.xhp b/source/text/sdatabase/dabawiz02text.xhp
index 6d8ef04cf1..7878f3b993 100644
--- a/source/text/sdatabase/dabawiz02text.xhp
+++ b/source/text/sdatabase/dabawiz02text.xhp
@@ -31,7 +31,7 @@
 <bookmark_value>text databases (Base)</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/dbwiztextpage/DBWizTextPage" id="bm_id1533859" localize="false"/>
-<h1 id="par_idN1054F">Set up a connection to text files</h1>
+<h1 id="par_idN1054F"><variable id="text"><link href="text/sdatabase/dabawiz02text.xhp">Text File Connection</link></variable></h1>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US"><ahelp hid=".">Specifies the settings for importing a database in text format.</ahelp><comment>UFI: most text copied without editing from shared\explorer\database\11040000</comment></paragraph>
 <paragraph role="paragraph" id="par_idN10568" xml-lang="en-US">In a text format database, data is stored in an unformatted ASCII file, where each record comprises a row. The data fields are divided by separators. Text in the data fields is divided by quotation marks.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/dbwiztextpage/browseurl" id="bm_id1533860" localize="false"/>