From 2271ad00c7e0312071b78706da40a778171bfb9a Mon Sep 17 00:00:00 2001
From: Olivier Hallot <olivier.hallot@libreoffice.org>
Date: Fri, 16 Jul 2021 18:14:55 -0300
Subject: Refactor database files

Change-Id: I10909197c08cec40819658d2d0951800133409da
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/119099
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
---
 AllLangHelp_sdatabase.mk                           |  5 ++
 AllLangHelp_shared.mk                              |  5 --
 source/text/sdatabase/dabadoc.xhp                  | 38 +++++++++++
 source/text/sdatabase/dabaprop.xhp                 | 41 ++++++++++++
 source/text/sdatabase/dabapropadd.xhp              | 73 ++++++++++++++++++++
 source/text/sdatabase/dabapropcon.xhp              | 46 +++++++++++++
 source/text/sdatabase/dabapropgen.xhp              | 73 ++++++++++++++++++++
 source/text/shared/01/01010000.xhp                 |  2 +-
 source/text/shared/explorer/database/dabadoc.xhp   | 38 -----------
 source/text/shared/explorer/database/dabaprop.xhp  | 44 ------------
 .../text/shared/explorer/database/dabapropadd.xhp  | 78 ----------------------
 .../text/shared/explorer/database/dabapropcon.xhp  | 49 --------------
 .../text/shared/explorer/database/dabapropgen.xhp  | 78 ----------------------
 source/text/shared/explorer/database/dabawiz00.xhp |  2 +-
 .../text/shared/explorer/database/menufilesave.xhp |  2 +-
 source/text/shared/guide/data_register.xhp         |  2 +-
 source/text/shared/guide/data_view.xhp             |  2 +-
 17 files changed, 281 insertions(+), 297 deletions(-)
 create mode 100644 source/text/sdatabase/dabadoc.xhp
 create mode 100644 source/text/sdatabase/dabaprop.xhp
 create mode 100644 source/text/sdatabase/dabapropadd.xhp
 create mode 100644 source/text/sdatabase/dabapropcon.xhp
 create mode 100644 source/text/sdatabase/dabapropgen.xhp
 delete mode 100644 source/text/shared/explorer/database/dabadoc.xhp
 delete mode 100644 source/text/shared/explorer/database/dabaprop.xhp
 delete mode 100644 source/text/shared/explorer/database/dabapropadd.xhp
 delete mode 100644 source/text/shared/explorer/database/dabapropcon.xhp
 delete mode 100644 source/text/shared/explorer/database/dabapropgen.xhp

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index 337313b72e..23346f8c9d 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -48,6 +48,11 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
     helpcontent2/source/text/sdatabase/dabaadvpropdat \
     helpcontent2/source/text/sdatabase/dabaadvpropgen \
     helpcontent2/source/text/sdatabase/dabaadvprop \
+    helpcontent2/source/text/sdatabase/dabadoc \
+    helpcontent2/source/text/sdatabase/dabaprop \
+    helpcontent2/source/text/sdatabase/dabapropadd \
+    helpcontent2/source/text/sdatabase/dabapropcon \
+    helpcontent2/source/text/sdatabase/dabapropgen \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index ef4b88e0b5..107c8b1a52 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -865,11 +865,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 ))
 
 $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
-    helpcontent2/source/text/shared/explorer/database/dabadoc \
-    helpcontent2/source/text/shared/explorer/database/dabaprop \
-    helpcontent2/source/text/shared/explorer/database/dabapropadd \
-    helpcontent2/source/text/shared/explorer/database/dabapropcon \
-    helpcontent2/source/text/shared/explorer/database/dabapropgen \
     helpcontent2/source/text/shared/explorer/database/dabawiz00 \
     helpcontent2/source/text/shared/explorer/database/dabawiz01 \
     helpcontent2/source/text/shared/explorer/database/dabawiz02 \
diff --git a/source/text/sdatabase/dabadoc.xhp b/source/text/sdatabase/dabadoc.xhp
new file mode 100644
index 0000000000..4ed6c6b95b
--- /dev/null
+++ b/source/text/sdatabase/dabadoc.xhp
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+ * This file is part of the LibreOffice 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   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="textsharedexplorerdatabasedabadocxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Database File</title>
+         <filename>/text/sdatabase/dabadoc.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="dabadoc">
+         <h1 id="par_idN10544"><link href="text/sdatabase/dabadoc.xhp">Database File</link></h1>
+         <paragraph xml-lang="en-US" id="par_idN10554" role="paragraph"><ahelp hid=".">The database file window organizes the tables, views, queries, and reports of a database in %PRODUCTNAME.</ahelp></paragraph>
+      </section>
+      <section id="relatedtopics">
+         <paragraph xml-lang="en-US" id="par_idN105B7" role="paragraph"><link href="text/sdatabase/main.xhp">Working with databases in %PRODUCTNAME</link></paragraph>
+      </section>
+   </body>
+</helpdocument>
diff --git a/source/text/sdatabase/dabaprop.xhp b/source/text/sdatabase/dabaprop.xhp
new file mode 100644
index 0000000000..8539d3008a
--- /dev/null
+++ b/source/text/sdatabase/dabaprop.xhp
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+<helpdocument version="1.0">
+<meta>
+<topic id="textsharedexplorerdatabasedabapropxml" indexer="include" status="PUBLISH">
+<title id="tit" xml-lang="en-US">Database Properties</title>
+<filename>/text/sdatabase/dabaprop.xhp</filename>
+</topic>
+<history>
+<created date="2004-07-30T10:08:04">UFI: Database Properties dialog</created>
+</history>
+</meta>
+<body>
+<section id="dabaprop">
+<h1 id="par_idN10550"><link href="text/sdatabase/dabaprop.xhp">Database Properties</link></h1>
+<paragraph role="paragraph" id="par_idN10560" xml-lang="en-US"><ahelp hid=".">Specifies the properties of a database.</ahelp></paragraph>
+</section>
+<section id="howtoget">
+<paragraph role="paragraph" id="par_id1322977" xml-lang="en-US">In a database window, choose <emph>Edit - Database - Properties</emph>
+</paragraph>
+</section>
+<embed href="text/sdatabase/dabapropgen.xhp#dabapropgen"/>
+<embed href="text/sdatabase/dabapropadd.xhp#dabapropadd"/>
+</body>
+</helpdocument>
diff --git a/source/text/sdatabase/dabapropadd.xhp b/source/text/sdatabase/dabapropadd.xhp
new file mode 100644
index 0000000000..677f14a7bb
--- /dev/null
+++ b/source/text/sdatabase/dabapropadd.xhp
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+<helpdocument version="1.0">
+<meta>
+<topic id="textsharedexplorerdatabasedabapropaddxml" indexer="include" status="PUBLISH">
+<title id="tit" xml-lang="en-US">Additional Settings</title>
+<filename>/text/sdatabase/dabapropadd.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="dabapropadd">
+<h1 id="par_idN1054D"><link href="text/sdatabase/dabapropadd.xhp">Additional Settings</link></h1>
+<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US"><ahelp hid=".">Specifies additional options for a data source.</ahelp></paragraph>
+</section>
+<section id="howtoget">
+<paragraph role="paragraph" id="par_id4641865" xml-lang="en-US">In a database window, choose <emph>Edit - Database - Properties</emph>, click <emph>Additional Settings</emph> tab</paragraph>
+</section>
+<paragraph role="paragraph" id="par_idN10572" xml-lang="en-US">The availability of the following controls depends on the type of database:</paragraph>
+<h2 id="par_idN10575">Host name</h2>
+<paragraph role="paragraph" id="par_idN105D7" xml-lang="en-US"><ahelp hid=".">Enter the host name of the server that contains the database, for example ldap.server.com.</ahelp><comment>used for multiple database formats</comment></paragraph>
+<h2 id="par_idN10579">Port number</h2>
+<paragraph role="paragraph" id="par_idN105F6" xml-lang="en-US"><ahelp hid=".">Enter the port number for the server that hosts the database.</ahelp><comment>UFI: used for LDAP and MySQL, different default values</comment></paragraph>
+<h2 id="par_idN1057D">MySQL JDBC driver class</h2>
+<paragraph role="paragraph" id="par_idN10615" xml-lang="en-US"><ahelp hid=".">Enter the name of the JDBC driver for the MySQL database.</ahelp><comment>UFI: copied from shared\explorer\database\11110000.xhp but that was changed before (??)</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_CHARSET" id="bm_id9317606" localize="false"/><h2 id="par_idN10581">Character set<comment>UFI: seen for dBase</comment><comment>and for text file folder</comment></h2>
+<paragraph role="paragraph" id="par_idN10634" xml-lang="en-US"><ahelp hid=".">Select the character set that you want to use to view the database in $[officename].</ahelp> This setting does not affect the database. To use the default character set of your operating system, select "System".</paragraph>
+<note id="par_idN10651">Text and dBASE databases are restricted to character sets with a fixed-size character length, where all characters are encoded with the same number of bytes.<comment>UFI. copied from shared\explorer\database\11020000.xhp</comment></note>
+<h2 id="par_idN10585">Oracle JDBC driver class</h2>
+<paragraph role="paragraph" id="par_idN10653" xml-lang="en-US"><ahelp hid=".">Enter the name of the JDBC driver for the Oracle database.</ahelp><comment>UFI: copied from shared\explorer\database\11110000.xhp but that was changed before (??)</comment></paragraph>
+<h2 id="par_idN10589">Driver settings</h2>
+<paragraph role="paragraph" id="par_idN10672" xml-lang="en-US"><ahelp hid=".">Specify additional driver options.</ahelp><comment>UFI. copied from shared\explorer\database\11020000.xhp</comment></paragraph>
+<h2 id="par_idN1058D">Use catalog for file-based databases</h2>
+<paragraph role="paragraph" id="par_idN10691" xml-lang="en-US"><ahelp hid=".">Uses the current data source of the catalog. This option is useful when the ODBC data source is a database server. Do not select this option if the ODBC data source is a dBASE driver.</ahelp><comment>UFI. copied from shared\explorer\database\11020000.xhp</comment></paragraph>
+<h2 id="par_idN10591">Base DN</h2>
+<paragraph role="paragraph" id="par_idN106B0" xml-lang="en-US"><ahelp hid=".">Enter the starting point to search the LDAP database, for example, dc=com.</ahelp><comment>copied from shared\explorer\database\11190000.xhp</comment></paragraph>
+<h2 id="par_idN10595">Maximum number of records</h2>
+<paragraph role="paragraph" id="par_idN106F3" xml-lang="en-US"><ahelp hid=".">Enter the maximum number of records that you want to load when you access the LDAP server.</ahelp></paragraph>
+<h2 id="par_idN10599">Display deleted records as well<comment>UFI: seen for dBase, but Help ID is somewhere else</comment></h2>
+<paragraph role="paragraph" id="par_idN10700" xml-lang="en-US"><ahelp hid=".">Displays all the records in a file, including those marked as deleted. If you select this check box, you cannot delete records.</ahelp><comment>copied from shared\explorer\database\11030000.xhp</comment></paragraph>
+<note id="par_idN10715">In dBASE format, deleted records remain in the file.</note>
+<tip id="par_idN10718">To view changes that you make to the database, close the connection to the database, and then reconnect to the database.</tip>
+<h2 id="par_idN1059D">Indexes<comment>UFI: seen for dBase</comment></h2>
+<paragraph role="paragraph" id="par_idN10725" xml-lang="en-US"><ahelp hid=".">Opens the Indexes dialog, where you can organize the table indexes in the current dBASE database.</ahelp><comment>UFI: removed link from extended help text</comment></paragraph>
+<h2 id="par_idN105B9">Text contains headers<comment>UFI: the following found for a text file folder, but HELP Ids are somewhere else</comment></h2>
+<paragraph role="paragraph" id="par_idN107B0" xml-lang="en-US"><ahelp hid=".">Select this check box if the first line of the text file contains field names.</ahelp><comment>copied from shared\explorer\database\11040000.xhp</comment></paragraph>
+<h2 id="par_idN105BD">Field separator</h2>
+<paragraph role="paragraph" id="par_idN107CF" xml-lang="en-US"><ahelp hid=".">Enter or select the character that separates data fields in the text file.</ahelp></paragraph>
+<h2 id="par_idN105C1">Text separator</h2>
+<paragraph role="paragraph" id="par_idN107DC" xml-lang="en-US"><ahelp hid=".">Enter or select the character that identifies a text field in the text file. You cannot use the same character as the field separator.</ahelp></paragraph>
+<h2 id="par_idN105C5">Decimal separator</h2>
+<paragraph role="paragraph" id="par_idN107E9" xml-lang="en-US"><ahelp hid=".">Enter or select the character that is used as a decimal separator in the text file, for example, a period (0.5) or a comma (0,5).</ahelp></paragraph>
+<h2 id="par_idN105C9">Thousands separator</h2>
+<paragraph role="paragraph" id="par_idN107F6" xml-lang="en-US"><ahelp hid=".">Enter or select the character that is used as a thousands separator in the text file, for example a comma (1,000), or a period (1.000).</ahelp></paragraph>
+<h2 id="par_idN105CD">File extension</h2>
+<paragraph role="paragraph" id="par_idN10803" xml-lang="en-US"><ahelp hid=".">Select the format for the text file.</ahelp> The extension that you select affects some of the default settings in this dialog. </paragraph>
+</body>
+</helpdocument>
diff --git a/source/text/sdatabase/dabapropcon.xhp b/source/text/sdatabase/dabapropcon.xhp
new file mode 100644
index 0000000000..14a79b016a
--- /dev/null
+++ b/source/text/sdatabase/dabapropcon.xhp
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+<helpdocument version="1.0">
+<meta>
+<topic id="textsharedexplorerdatabasedabapropconxml" indexer="include" status="PUBLISH">
+<title id="tit" xml-lang="en-US">Connection Type Wizard</title>
+<filename>/text/sdatabase/dabapropcon.xhp</filename>
+</topic>
+<history>
+<created date="2004-07-30T13:06:20">Connection Type Wizard</created>
+</history>
+</meta>
+<body>
+<section id="connection">
+<h1 id="par_idN1054D"><link href="text/sdatabase/dabapropcon.xhp">Connection Type Wizard</link></h1>
+<paragraph role="paragraph" id="par_idN10551" xml-lang="en-US"><ahelp hid=".">Changes the type of connection for the current database.</ahelp></paragraph>
+</section>
+<section id="howtoget">
+<paragraph role="paragraph" id="par_id9003875" xml-lang="en-US">In a database window, choose <emph>Edit - Database - Connection Type</emph>
+</paragraph>
+</section>
+<paragraph role="paragraph" id="par_idN10569" xml-lang="en-US">The Connection Type Wizard consists of three pages. You cannot transfer all settings from one database type to another.<comment>UFI: what does this para mean? Who writes such &amp;/()?</comment></paragraph>
+<paragraph role="paragraph" id="par_idN1056C" xml-lang="en-US">For example, you can use the wizard to open a database file that is in a format that is usually not recognized by an installed database.<comment>UFI: what does this para mean? Who writes such &amp;/()?</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_SPECIAL_MESSAGE" id="bm_id3653981" localize="false"/>
+<h2 id="par_idN1056F">Database type</h2>
+<paragraph role="paragraph" id="par_idN10573" xml-lang="en-US"><ahelp hid=".">Select the type of database that you want to connect to.</ahelp></paragraph>
+<embed href="text/sdatabase/dabapropgen.xhp#dabapropgen"/>
+<embed href="text/sdatabase/dabapropadd.xhp#dabapropadd"/>
+</body>
+</helpdocument>
diff --git a/source/text/sdatabase/dabapropgen.xhp b/source/text/sdatabase/dabapropgen.xhp
new file mode 100644
index 0000000000..c1f1f398d8
--- /dev/null
+++ b/source/text/sdatabase/dabapropgen.xhp
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+<helpdocument version="1.0">
+<meta>
+<topic id="textsharedexplorerdatabasedabapropgenxml" indexer="include" status="PUBLISH">
+<title id="tit" xml-lang="en-US">Advanced Properties</title>
+<filename>/text/sdatabase/dabapropgen.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="dabapropgen">
+<h1 id="par_idN1054D"><link href="text/sdatabase/dabapropgen.xhp">Advanced Properties</link></h1>
+<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US">Specifies some options for a database.</paragraph>
+</section>
+<section id="howtoget">
+<paragraph role="paragraph" id="par_id4513992" xml-lang="en-US">In a database window, choose <emph>Edit - Database - Properties</emph>, click <emph>Advanced Properties</emph> tab</paragraph>
+</section>
+<paragraph role="paragraph" id="par_idN10572" xml-lang="en-US">The availability of the following controls depends on the type of database:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_DBASE_PATH" id="bm_id4886623" localize="false"/><h2 id="par_idN10575">Path to dBASE files<comment>UFI: found for dBase</comment></h2>
+<paragraph role="paragraph" id="par_idN10579" xml-lang="en-US"><ahelp hid=".">Enter the path to the directory that contains the dBASE files.</ahelp></paragraph>
+<warning id="par_idN1057C">Ensure that the *.dbf file name extension of the dBASE files is lowercase.<comment>moved from shared\explorer\database\11030000.xhp</comment></warning>
+<h2 id="par_idN10591">Browse<comment>UFI: found for dBase</comment></h2>
+<paragraph role="paragraph" id="par_idN10595" xml-lang="en-US"><ahelp hid=".">Opens a dialog where you can select a file or a directory.</ahelp><comment>which one? or depends?</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/connectionpage/connectionButton" id="bm_id7854243" localize="false"/><h2 id="par_idN105AA">Test Connection<comment>UFI: found for dBase</comment><comment>and for Calc doc</comment></h2>
+<paragraph role="paragraph" id="par_idN105AE" xml-lang="en-US"><ahelp hid=".">Tests the database connection with the current settings.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_FLAT_PATH" id="bm_id4529251" localize="false"/><h2 id="par_idN105B1">Path to the text files<comment>UFI: found for text file folder</comment></h2>
+<paragraph role="paragraph" id="par_idN105B5" xml-lang="en-US"><ahelp hid=".">Enter the path to the folder of the text files.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_CALC_PATH" id="bm_id8492385" localize="false"/><h2 id="par_idN105B8">Path to the spreadsheet document<comment>UFI: found for a Calc doc</comment></h2>
+<paragraph role="paragraph" id="par_idN105BC" xml-lang="en-US"><ahelp hid=".">Enter the path to the spreadsheet document that you want to use as a database.</ahelp></paragraph>
+<h2 id="par_idN105BF">Name of the ODBC data source on your system</h2>
+<paragraph role="paragraph" id="par_idN105C3" xml-lang="en-US"><ahelp hid=".">Enter the name of the ODBC data source.</ahelp></paragraph>
+<h2 id="par_idN105C6">User name</h2>
+<paragraph role="paragraph" id="par_idN105CA" xml-lang="en-US"><ahelp hid=".">Enter the user name that is required to access the database.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/connectionpage/passCheckbutton" id="bm_id4072084" localize="false"/><h2 id="par_idN105CD">Password required<comment>UFI: found for Calc doc</comment></h2>
+<paragraph role="paragraph" id="par_idN105D1" xml-lang="en-US"><ahelp hid=".">If checked, the user will be asked to enter the password that is required to access the database.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME" id="bm_id7675099" localize="false"/><h2 id="hd_id7806329">Name of the database<comment>UFI: found for JDBC</comment></h2>
+<paragraph role="paragraph" id="par_id5589159" xml-lang="en-US"><ahelp hid=".">Enter the name of the database.</ahelp></paragraph>
+<h2 id="par_idN105D4">Name of the MySQL database</h2>
+<paragraph role="paragraph" id="par_idN105D8" xml-lang="en-US"><ahelp hid=".">Enter the name of the MySQL database that you want to use as a data source.</ahelp></paragraph>
+<h2 id="par_idN105DB">Name of the Oracle database</h2>
+<paragraph role="paragraph" id="par_idN105DF" xml-lang="en-US"><ahelp hid=".">Enter the name of the Oracle database that you want to use as a data source.</ahelp></paragraph>
+<h2 id="par_idN105E9">Microsoft Access database file</h2>
+<paragraph role="paragraph" id="par_idN105ED" xml-lang="en-US"><ahelp hid=".">Enter the name of the Microsoft Access database file that you want to use as a data source.</ahelp></paragraph>
+<h2 id="par_idN105F0">Host name</h2>
+<paragraph role="paragraph" id="par_idN105F4" xml-lang="en-US"><ahelp hid=".">Enter the host name for the LDAP data source.</ahelp></paragraph>
+<h2 id="par_idN105F7">Data source URL</h2>
+<paragraph role="paragraph" id="par_idN105FB" xml-lang="en-US"><ahelp hid=".">Enter the location of the JDBC data source as a URL.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS" id="bm_id9936216" localize="false"/>
+<!-- removed HID 39110 --><h2 id="par_idN105FE">JDBC driver class</h2>
+<paragraph role="paragraph" id="par_idN10602" xml-lang="en-US"><ahelp hid=".">Enter the name of the JDBC driver class that connects to the data source.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS" id="bm_id7953123" localize="false"/>
+<!-- removed HID 39111 --><h2 id="par_idN10605">Test Class<comment>UFI: found for JDBC</comment></h2>
+<paragraph role="paragraph" id="par_idN10609" xml-lang="en-US"><ahelp hid=".">Tests the database connection through the JDBC driver class.</ahelp></paragraph>
+<h3 id="par_idN10613">Choose a database</h3>
+<paragraph role="paragraph" id="par_idN10617" xml-lang="en-US"><ahelp hid=".">Select a database from the list or click <emph>Create</emph> to create a new database.</ahelp></paragraph>
+</body>
+</helpdocument>
diff --git a/source/text/shared/01/01010000.xhp b/source/text/shared/01/01010000.xhp
index f70edac47c..fb357cdd54 100644
--- a/source/text/shared/01/01010000.xhp
+++ b/source/text/shared/01/01010000.xhp
@@ -105,7 +105,7 @@
       <paragraph role="paragraph" id="par_idN108CB" xml-lang="en-US">Database</paragraph>
     </tablecell>
     <tablecell colspan="" rowspan="">
-      <paragraph role="paragraph" id="par_idN108D0" xml-lang="en-US">Opens the <link href="text/shared/explorer/database/dabawiz00.xhp"><emph>Database Wizard</emph></link> to create a <link href="text/shared/explorer/database/dabadoc.xhp"><emph>database file</emph></link>.</paragraph>
+      <paragraph role="paragraph" id="par_idN108D0" xml-lang="en-US">Opens the <link href="text/shared/explorer/database/dabawiz00.xhp"><emph>Database Wizard</emph></link> to create a <link href="text/sdatabase/dabadoc.xhp"><emph>database file</emph></link>.</paragraph>
     </tablecell>
   </tablerow>
   <tablerow>
diff --git a/source/text/shared/explorer/database/dabadoc.xhp b/source/text/shared/explorer/database/dabadoc.xhp
deleted file mode 100644
index d3d785f4a0..0000000000
--- a/source/text/shared/explorer/database/dabadoc.xhp
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<helpdocument version="1.0">
-	
-<!--
- * This file is part of the LibreOffice 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   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="textsharedexplorerdatabasedabadocxml" indexer="include" status="PUBLISH">
-         <title xml-lang="en-US" id="tit">Database File</title>
-         <filename>/text/shared/explorer/database/dabadoc.xhp</filename>
-      </topic>
-   </meta>
-   <body>
-      <section id="dabadoc">
-         <paragraph xml-lang="en-US" id="par_idN10544" role="heading" level="1"><link href="text/shared/explorer/database/dabadoc.xhp">Database File</link></paragraph>
-         <paragraph xml-lang="en-US" id="par_idN10554" role="paragraph"><ahelp hid=".">The database file window organizes the tables, views, queries, and reports of a database in %PRODUCTNAME.</ahelp></paragraph>
-      </section>
-      <section id="relatedtopics">
-         <paragraph xml-lang="en-US" id="par_idN105B7" role="paragraph"><link href="text/sdatabase/main.xhp">Working with databases in %PRODUCTNAME</link></paragraph>
-      </section>
-   </body>
-</helpdocument>
\ No newline at end of file
diff --git a/source/text/shared/explorer/database/dabaprop.xhp b/source/text/shared/explorer/database/dabaprop.xhp
deleted file mode 100644
index 6e85496cce..0000000000
--- a/source/text/shared/explorer/database/dabaprop.xhp
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- * This file is part of the LibreOffice 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-	
-<helpdocument version="1.0">
-<meta>
-<topic id="textsharedexplorerdatabasedabapropxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Database Properties</title>
-<filename>/text/shared/explorer/database/dabaprop.xhp</filename>
-</topic>
-<history>
-<created date="2004-07-30T10:08:04">UFI: Database Properties dialog</created>
-</history>
-</meta>
-<body>
-<section id="dabaprop">
-<paragraph role="heading" id="par_idN10550" xml-lang="en-US" level="1"><link href="text/shared/explorer/database/dabaprop.xhp">Database Properties</link></paragraph>
-<paragraph role="paragraph" id="par_idN10560" xml-lang="en-US"><ahelp hid=".">Specifies the properties of a database.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<paragraph role="paragraph" id="par_id1322977" xml-lang="en-US">In a database window, choose <emph>Edit - Database - Properties</emph>
-</paragraph>
-</section>
-<embed href="text/shared/explorer/database/dabapropgen.xhp#dabapropgen"/>
-<embed href="text/shared/explorer/database/dabapropadd.xhp#dabapropadd"/>
-</body>
-</helpdocument>
diff --git a/source/text/shared/explorer/database/dabapropadd.xhp b/source/text/shared/explorer/database/dabapropadd.xhp
deleted file mode 100644
index 1c603813d6..0000000000
--- a/source/text/shared/explorer/database/dabapropadd.xhp
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<!--
- * This file is part of the LibreOffice 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-
-		<helpdocument version="1.0">
-<meta>
-<topic id="textsharedexplorerdatabasedabapropaddxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Additional Settings</title>
-<filename>/text/shared/explorer/database/dabapropadd.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="dabapropadd">
-<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1"><link href="text/shared/explorer/database/dabapropadd.xhp">Additional Settings</link></paragraph>
-<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US"><ahelp hid=".">Specifies additional options for a data source.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<paragraph role="paragraph" id="par_id4641865" xml-lang="en-US">In a database window, choose <emph>Edit - Database - Properties</emph>, click <emph>Additional Settings</emph> tab</paragraph>
-</section>
-<paragraph role="paragraph" id="par_idN10572" xml-lang="en-US">The availability of the following controls depends on the type of database:</paragraph>
-<paragraph role="heading" id="par_idN10575" xml-lang="en-US" level="2">Host name</paragraph>
-<paragraph role="paragraph" id="par_idN105D7" xml-lang="en-US"><ahelp hid=".">Enter the host name of the server that contains the database, for example ldap.server.com.</ahelp><comment>used for multiple database formats</comment></paragraph>
-<paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="2">Port number</paragraph>
-<paragraph role="paragraph" id="par_idN105F6" xml-lang="en-US"><ahelp hid=".">Enter the port number for the server that hosts the database.</ahelp><comment>UFI: used for LDAP and MySQL, different default values</comment></paragraph>
-<paragraph role="heading" id="par_idN1057D" xml-lang="en-US" level="2">MySQL JDBC driver class</paragraph>
-<paragraph role="paragraph" id="par_idN10615" xml-lang="en-US"><ahelp hid=".">Enter the name of the JDBC driver for the MySQL database.</ahelp><comment>UFI: copied from shared\explorer\database\11110000.xhp but that was changed before (??)</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_CHARSET" id="bm_id9317606" localize="false"/><paragraph role="heading" id="par_idN10581" xml-lang="en-US" level="2">Character set<comment>UFI: seen for dBase</comment><comment>and for text file folder</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10634" xml-lang="en-US"><ahelp hid=".">Select the character set that you want to use to view the database in $[officename].</ahelp> This setting does not affect the database. To use the default character set of your operating system, select "System".</paragraph>
-<paragraph role="note" id="par_idN10651" xml-lang="en-US">Text and dBASE databases are restricted to character sets with a fixed-size character length, where all characters are encoded with the same number of bytes.<comment>UFI. copied from shared\explorer\database\11020000.xhp</comment></paragraph>
-<paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="2">Oracle JDBC driver class</paragraph>
-<paragraph role="paragraph" id="par_idN10653" xml-lang="en-US"><ahelp hid=".">Enter the name of the JDBC driver for the Oracle database.</ahelp><comment>UFI: copied from shared\explorer\database\11110000.xhp but that was changed before (??)</comment></paragraph>
-<paragraph role="heading" id="par_idN10589" xml-lang="en-US" level="2">Driver settings</paragraph>
-<paragraph role="paragraph" id="par_idN10672" xml-lang="en-US"><ahelp hid=".">Specify additional driver options.</ahelp><comment>UFI. copied from shared\explorer\database\11020000.xhp</comment></paragraph>
-<paragraph role="heading" id="par_idN1058D" xml-lang="en-US" level="2">Use catalog for file-based databases</paragraph>
-<paragraph role="paragraph" id="par_idN10691" xml-lang="en-US"><ahelp hid=".">Uses the current data source of the catalog. This option is useful when the ODBC data source is a database server. Do not select this option if the ODBC data source is a dBASE driver.</ahelp><comment>UFI. copied from shared\explorer\database\11020000.xhp</comment></paragraph>
-<paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="2">Base DN</paragraph>
-<paragraph role="paragraph" id="par_idN106B0" xml-lang="en-US"><ahelp hid=".">Enter the starting point to search the LDAP database, for example, dc=com.</ahelp><comment>copied from shared\explorer\database\11190000.xhp</comment></paragraph>
-<paragraph role="heading" id="par_idN10595" xml-lang="en-US" level="2">Maximum number of records</paragraph>
-<paragraph role="paragraph" id="par_idN106F3" xml-lang="en-US"><ahelp hid=".">Enter the maximum number of records that you want to load when you access the LDAP server.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN10599" xml-lang="en-US" level="2">Display deleted records as well<comment>UFI: seen for dBase, but Help ID is somewhere else</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10700" xml-lang="en-US"><ahelp hid=".">Displays all the records in a file, including those marked as deleted. If you select this check box, you cannot delete records.</ahelp><comment>copied from shared\explorer\database\11030000.xhp</comment></paragraph>
-<paragraph role="note" id="par_idN10715" xml-lang="en-US">In dBASE format, deleted records remain in the file.</paragraph>
-<paragraph role="tip" id="par_idN10718" xml-lang="en-US">To view changes that you make to the database, close the connection to the database, and then reconnect to the database.</paragraph>
-<paragraph role="heading" id="par_idN1059D" xml-lang="en-US" level="2">Indexes<comment>UFI: seen for dBase</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10725" xml-lang="en-US"><ahelp hid=".">Opens the Indexes dialog, where you can organize the table indexes in the current dBASE database.</ahelp><comment>UFI: removed link from extended help text</comment></paragraph>
-<paragraph role="heading" id="par_idN105B9" xml-lang="en-US" level="2">Text contains headers<comment>UFI: the following found for a text file folder, but HELP Ids are somewhere else</comment></paragraph>
-<paragraph role="paragraph" id="par_idN107B0" xml-lang="en-US"><ahelp hid=".">Select this check box if the first line of the text file contains field names.</ahelp><comment>copied from shared\explorer\database\11040000.xhp</comment></paragraph>
-<paragraph role="heading" id="par_idN105BD" xml-lang="en-US" level="2">Field separator</paragraph>
-<paragraph role="paragraph" id="par_idN107CF" xml-lang="en-US"><ahelp hid=".">Enter or select the character that separates data fields in the text file.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN105C1" xml-lang="en-US" level="2">Text separator</paragraph>
-<paragraph role="paragraph" id="par_idN107DC" xml-lang="en-US"><ahelp hid=".">Enter or select the character that identifies a text field in the text file. You cannot use the same character as the field separator.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN105C5" xml-lang="en-US" level="2">Decimal separator</paragraph>
-<paragraph role="paragraph" id="par_idN107E9" xml-lang="en-US"><ahelp hid=".">Enter or select the character that is used as a decimal separator in the text file, for example, a period (0.5) or a comma (0,5).</ahelp></paragraph>
-<paragraph role="heading" id="par_idN105C9" xml-lang="en-US" level="2">Thousands separator</paragraph>
-<paragraph role="paragraph" id="par_idN107F6" xml-lang="en-US"><ahelp hid=".">Enter or select the character that is used as a thousands separator in the text file, for example a comma (1,000), or a period (1.000).</ahelp></paragraph>
-<paragraph role="heading" id="par_idN105CD" xml-lang="en-US" level="2">File extension</paragraph>
-<paragraph role="paragraph" id="par_idN10803" xml-lang="en-US"><ahelp hid=".">Select the format for the text file.</ahelp> The extension that you select affects some of the default settings in this dialog. </paragraph>
-</body>
-</helpdocument>
diff --git a/source/text/shared/explorer/database/dabapropcon.xhp b/source/text/shared/explorer/database/dabapropcon.xhp
deleted file mode 100644
index 87b7f9a5f8..0000000000
--- a/source/text/shared/explorer/database/dabapropcon.xhp
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- * This file is part of the LibreOffice 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-	
-<helpdocument version="1.0">
-<meta>
-<topic id="textsharedexplorerdatabasedabapropconxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Connection Type Wizard</title>
-<filename>/text/shared/explorer/database/dabapropcon.xhp</filename>
-</topic>
-<history>
-<created date="2004-07-30T13:06:20">Connection Type Wizard</created>
-</history>
-</meta>
-<body>
-<section id="connection">
-<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1"><link href="text/shared/explorer/database/dabapropcon.xhp">Connection Type Wizard</link></paragraph>
-<paragraph role="paragraph" id="par_idN10551" xml-lang="en-US"><ahelp hid=".">Changes the type of connection for the current database.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<paragraph role="paragraph" id="par_id9003875" xml-lang="en-US">In a database window, choose <emph>Edit - Database - Connection Type</emph>
-</paragraph>
-</section>
-<paragraph role="paragraph" id="par_idN10569" xml-lang="en-US">The Connection Type Wizard consists of three pages. You cannot transfer all settings from one database type to another.<comment>UFI: what does this para mean? Who writes such &amp;/()?</comment></paragraph>
-<paragraph role="paragraph" id="par_idN1056C" xml-lang="en-US">For example, you can use the wizard to open a database file that is in a format that is usually not recognized by an installed database.<comment>UFI: what does this para mean? Who writes such &amp;/()?</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_SPECIAL_MESSAGE" id="bm_id3653981" localize="false"/>
-<paragraph role="heading" id="par_idN1056F" xml-lang="en-US" level="2">Database type</paragraph>
-<paragraph role="paragraph" id="par_idN10573" xml-lang="en-US"><ahelp hid=".">Select the type of database that you want to connect to.</ahelp></paragraph>
-<embed href="text/shared/explorer/database/dabapropgen.xhp#dabapropgen"/>
-<embed href="text/shared/explorer/database/dabapropadd.xhp#dabapropadd"/>
-</body>
-</helpdocument>
diff --git a/source/text/shared/explorer/database/dabapropgen.xhp b/source/text/shared/explorer/database/dabapropgen.xhp
deleted file mode 100644
index a23d46edca..0000000000
--- a/source/text/shared/explorer/database/dabapropgen.xhp
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<!--
- * This file is part of the LibreOffice 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-
-		<helpdocument version="1.0">
-<meta>
-<topic id="textsharedexplorerdatabasedabapropgenxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Advanced Properties</title>
-<filename>/text/shared/explorer/database/dabapropgen.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="dabapropgen">
-<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1"><link href="text/shared/explorer/database/dabapropgen.xhp">Advanced Properties</link></paragraph>
-<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US">Specifies some options for a database.</paragraph>
-</section>
-<section id="howtoget">
-<paragraph role="paragraph" id="par_id4513992" xml-lang="en-US">In a database window, choose <emph>Edit - Database - Properties</emph>, click <emph>Advanced Properties</emph> tab</paragraph>
-</section>
-<paragraph role="paragraph" id="par_idN10572" xml-lang="en-US">The availability of the following controls depends on the type of database:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_DBASE_PATH" id="bm_id4886623" localize="false"/><paragraph role="heading" id="par_idN10575" xml-lang="en-US" level="2">Path to dBASE files<comment>UFI: found for dBase</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10579" xml-lang="en-US"><ahelp hid=".">Enter the path to the directory that contains the dBASE files.</ahelp></paragraph>
-<paragraph role="warning" id="par_idN1057C" xml-lang="en-US">Ensure that the *.dbf file name extension of the dBASE files is lowercase.<comment>moved from shared\explorer\database\11030000.xhp</comment></paragraph>
-<paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="2">Browse<comment>UFI: found for dBase</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10595" xml-lang="en-US"><ahelp hid=".">Opens a dialog where you can select a file or a directory.</ahelp><comment>which one? or depends?</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/connectionpage/connectionButton" id="bm_id7854243" localize="false"/><paragraph role="heading" id="par_idN105AA" xml-lang="en-US" level="2">Test Connection<comment>UFI: found for dBase</comment><comment>and for Calc doc</comment></paragraph>
-<paragraph role="paragraph" id="par_idN105AE" xml-lang="en-US"><ahelp hid=".">Tests the database connection with the current settings.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_FLAT_PATH" id="bm_id4529251" localize="false"/><paragraph role="heading" id="par_idN105B1" xml-lang="en-US" level="2">Path to the text files<comment>UFI: found for text file folder</comment></paragraph>
-<paragraph role="paragraph" id="par_idN105B5" xml-lang="en-US"><ahelp hid=".">Enter the path to the folder of the text files.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_CALC_PATH" id="bm_id8492385" localize="false"/><paragraph role="heading" id="par_idN105B8" xml-lang="en-US" level="2">Path to the spreadsheet document<comment>UFI: found for a Calc doc</comment></paragraph>
-<paragraph role="paragraph" id="par_idN105BC" xml-lang="en-US"><ahelp hid=".">Enter the path to the spreadsheet document that you want to use as a database.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN105BF" xml-lang="en-US" level="2">Name of the ODBC data source on your system</paragraph>
-<paragraph role="paragraph" id="par_idN105C3" xml-lang="en-US"><ahelp hid=".">Enter the name of the ODBC data source.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN105C6" xml-lang="en-US" level="2">User name</paragraph>
-<paragraph role="paragraph" id="par_idN105CA" xml-lang="en-US"><ahelp hid=".">Enter the user name that is required to access the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/connectionpage/passCheckbutton" id="bm_id4072084" localize="false"/><paragraph role="heading" id="par_idN105CD" xml-lang="en-US" level="2">Password required<comment>UFI: found for Calc doc</comment></paragraph>
-<paragraph role="paragraph" id="par_idN105D1" xml-lang="en-US"><ahelp hid=".">If checked, the user will be asked to enter the password that is required to access the database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME" id="bm_id7675099" localize="false"/><paragraph role="heading" id="hd_id7806329" xml-lang="en-US" level="2">Name of the database<comment>UFI: found for JDBC</comment></paragraph>
-<paragraph role="paragraph" id="par_id5589159" xml-lang="en-US"><ahelp hid=".">Enter the name of the database.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN105D4" xml-lang="en-US" level="2">Name of the MySQL database</paragraph>
-<paragraph role="paragraph" id="par_idN105D8" xml-lang="en-US"><ahelp hid=".">Enter the name of the MySQL database that you want to use as a data source.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN105DB" xml-lang="en-US" level="2">Name of the Oracle database</paragraph>
-<paragraph role="paragraph" id="par_idN105DF" xml-lang="en-US"><ahelp hid=".">Enter the name of the Oracle database that you want to use as a data source.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN105E9" xml-lang="en-US" level="2">Microsoft Access database file</paragraph>
-<paragraph role="paragraph" id="par_idN105ED" xml-lang="en-US"><ahelp hid=".">Enter the name of the Microsoft Access database file that you want to use as a data source.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN105F0" xml-lang="en-US" level="2">Host name</paragraph>
-<paragraph role="paragraph" id="par_idN105F4" xml-lang="en-US"><ahelp hid=".">Enter the host name for the LDAP data source.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN105F7" xml-lang="en-US" level="2">Data source URL</paragraph>
-<paragraph role="paragraph" id="par_idN105FB" xml-lang="en-US"><ahelp hid=".">Enter the location of the JDBC data source as a URL.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS" id="bm_id9936216" localize="false"/>
-<!-- removed HID 39110 --><paragraph role="heading" id="par_idN105FE" xml-lang="en-US" level="2">JDBC driver class</paragraph>
-<paragraph role="paragraph" id="par_idN10602" xml-lang="en-US"><ahelp hid=".">Enter the name of the JDBC driver class that connects to the data source.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS" id="bm_id7953123" localize="false"/>
-<!-- removed HID 39111 --><paragraph role="heading" id="par_idN10605" xml-lang="en-US" level="2">Test Class<comment>UFI: found for JDBC</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10609" xml-lang="en-US"><ahelp hid=".">Tests the database connection through the JDBC driver class.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN10613" xml-lang="en-US" level="3">Choose a database</paragraph>
-<paragraph role="paragraph" id="par_idN10617" xml-lang="en-US"><ahelp hid=".">Select a database from the list or click <emph>Create</emph> to create a new database.</ahelp></paragraph>
-</body>
-</helpdocument>
diff --git a/source/text/shared/explorer/database/dabawiz00.xhp b/source/text/shared/explorer/database/dabawiz00.xhp
index 1bc61f46e0..bb1cb6d646 100644
--- a/source/text/shared/explorer/database/dabawiz00.xhp
+++ b/source/text/shared/explorer/database/dabawiz00.xhp
@@ -39,7 +39,7 @@
 <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generalpagewizard/PageGeneral" id="bm_id3952452" localize="false"/>
 <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>
+<paragraph role="paragraph" id="par_id9856563" xml-lang="en-US">The Database Wizard creates a <link href="text/sdatabase/dabadoc.xhp">database file</link> that contains information about a database.</paragraph>
 </section>
 <paragraph role="paragraph" id="par_idN105D5" xml-lang="en-US">Depending on the type of operation and the type of database, the Database Wizard consists of a varying number of steps.</paragraph>
 <list type="unordered">
diff --git a/source/text/shared/explorer/database/menufilesave.xhp b/source/text/shared/explorer/database/menufilesave.xhp
index 4cec435100..304a40d474 100644
--- a/source/text/shared/explorer/database/menufilesave.xhp
+++ b/source/text/shared/explorer/database/menufilesave.xhp
@@ -30,7 +30,7 @@
 <body>
 <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/collectionviewdialog/CollectionView" id="bm_id2862637" localize="false"/>
 <paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1">Save</paragraph>
-<paragraph role="paragraph" id="par_idN1054B" xml-lang="en-US">In this dialog, you can specify the position and name of a form <comment>UFI: spec says also for report, but reports can be created only by Wizard and are autosaved there</comment><comment>UFI: spec says also for query, cannot verify</comment>that you save within a <link href="text/shared/explorer/database/dabadoc.xhp">database file</link>. The dialog opens automatically when you save a form the first time.<comment>UFI: no chance to open the dialog a second time</comment></paragraph>
+<paragraph role="paragraph" id="par_idN1054B" xml-lang="en-US">In this dialog, you can specify the position and name of a form <comment>UFI: spec says also for report, but reports can be created only by Wizard and are autosaved there</comment><comment>UFI: spec says also for query, cannot verify</comment>that you save within a <link href="text/sdatabase/dabadoc.xhp">database file</link>. The dialog opens automatically when you save a form the first time.<comment>UFI: no chance to open the dialog a second time</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/collectionviewdialog/newFolderButton" id="bm_id2862636" localize="false"/>
 <paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2">Create New Directory</paragraph>
 <paragraph role="paragraph" id="par_idN10568" xml-lang="en-US"><ahelp hid=".">Click to create a new folder within the database file.</ahelp></paragraph>
diff --git a/source/text/shared/guide/data_register.xhp b/source/text/shared/guide/data_register.xhp
index 62f72b4aac..cbeaf9cb81 100644
--- a/source/text/shared/guide/data_register.xhp
+++ b/source/text/shared/guide/data_register.xhp
@@ -35,7 +35,7 @@
 <bookmark_value>lists;registered databases (Base)</bookmark_value>
 </bookmark><comment>mw deleted "removing;...". New entry "lists;" from shared/optionen/01160200.xhp</comment><paragraph role="heading" id="par_idN105A3" xml-lang="en-US" level="1"><variable id="data_register"><link href="text/shared/guide/data_register.xhp">Registering and Deleting a Database</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN105C1" xml-lang="en-US">Data from any <link href="text/shared/explorer/database/dabadoc.xhp">database file</link> can be registered to the installed instance of %PRODUCTNAME. To register means to tell %PRODUCTNAME where the data is located, how it is organized, how to get that data, and more. Once the database is registered, you can use the menu command <emph>View - Data source</emph> to access the data records from your text documents and spreadsheets.</paragraph>
+<paragraph role="paragraph" id="par_idN105C1" xml-lang="en-US">Data from any <link href="text/sdatabase/dabadoc.xhp">database file</link> can be registered to the installed instance of %PRODUCTNAME. To register means to tell %PRODUCTNAME where the data is located, how it is organized, how to get that data, and more. Once the database is registered, you can use the menu command <emph>View - Data source</emph> to access the data records from your text documents and spreadsheets.</paragraph>
 <paragraph role="heading" id="par_idN105C8" xml-lang="en-US" level="3">To register an existing database file:</paragraph>
 <list type="ordered">
 <listitem>
diff --git a/source/text/shared/guide/data_view.xhp b/source/text/shared/guide/data_view.xhp
index 64d6532eca..3572ac9f12 100644
--- a/source/text/shared/guide/data_view.xhp
+++ b/source/text/shared/guide/data_view.xhp
@@ -41,7 +41,7 @@
 <list type="unordered">
 <listitem>
 <paragraph role="paragraph" id="par_idN105CA" xml-lang="en-US">Choose <emph>File - Open</emph> to open the database file.</paragraph>
-<paragraph role="paragraph" id="par_idN105D1" xml-lang="en-US">The <link href="text/shared/explorer/database/dabadoc.xhp">database file</link> gives you full access to tables, queries, reports, and forms. You can edit the structure of your tables and change the contents of the data records.</paragraph>
+<paragraph role="paragraph" id="par_idN105D1" xml-lang="en-US">The <link href="text/sdatabase/dabadoc.xhp">database file</link> gives you full access to tables, queries, reports, and forms. You can edit the structure of your tables and change the contents of the data records.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_idN105E3" xml-lang="en-US">Choose <emph>View - Data source</emph> to view the registered databases.</paragraph>
-- 
cgit