AllLangHelp_sdatabase.mk                   |    5 +++
 AllLangHelp_shared.mk                      |    5 ---
 source/text/sdatabase/dabawiz02.xhp        |    2 -
 source/text/sdatabase/tablewizard00.xhp    |   20 +++++++--------
 source/text/sdatabase/tablewizard01.xhp    |   20 +++++++--------
 source/text/sdatabase/tablewizard02.xhp    |   37 ++++++++++++-----------------
 source/text/sdatabase/tablewizard03.xhp    |   27 ++++++++-------------
 source/text/sdatabase/tablewizard04.xhp    |   21 +++++++---------
 source/text/shared/guide/data_new.xhp      |    2 -
 source/text/shared/guide/data_tables.xhp   |    2 -
 source/text/shared/guide/database_main.xhp |    2 -
 source/text/shared/guide/main.xhp          |    2 -
 12 files changed, 66 insertions(+), 79 deletions(-)

New commits:
commit 04bef9c48889b4da6f332b1b31a9b45227b52c32
Author:     Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Thu Nov 18 15:11:55 2021 -0300
Commit:     Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Thu Nov 18 19:18:39 2021 +0100

    Refactor database help files
    
    Change-Id: Ie8f983d2c49f61084c456f8c7e91b41a6b5ac22a
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/125491
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index a2ad6311e..a83735de4 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -73,6 +73,11 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
     helpcontent2/source/text/sdatabase/menuinsert \
     helpcontent2/source/text/sdatabase/menutools \
     helpcontent2/source/text/sdatabase/menuview \
+    helpcontent2/source/text/sdatabase/tablewizard00 \
+    helpcontent2/source/text/sdatabase/tablewizard01 \
+    helpcontent2/source/text/sdatabase/tablewizard02 \
+    helpcontent2/source/text/sdatabase/tablewizard03 \
+    helpcontent2/source/text/sdatabase/tablewizard04 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index e758a8330..2642366a7 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -888,11 +888,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/explorer/database/rep_pagenumbers \
     helpcontent2/source/text/shared/explorer/database/rep_prop \
     helpcontent2/source/text/shared/explorer/database/rep_sort \
-    helpcontent2/source/text/shared/explorer/database/tablewizard00 \
-    helpcontent2/source/text/shared/explorer/database/tablewizard01 \
-    helpcontent2/source/text/shared/explorer/database/tablewizard02 \
-    helpcontent2/source/text/shared/explorer/database/tablewizard03 \
-    helpcontent2/source/text/shared/explorer/database/tablewizard04 \
 ,shared/explorer/database))
 
 # vim: set noet sw=4 ts=4:
diff --git a/source/text/sdatabase/dabawiz02.xhp 
b/source/text/sdatabase/dabawiz02.xhp
index 4bb8556ae..368bf6a15 100644
--- a/source/text/sdatabase/dabawiz02.xhp
+++ b/source/text/sdatabase/dabawiz02.xhp
@@ -36,7 +36,7 @@
 <bookmark xml-lang="en-US" 
branch="hid/dbaccess/ui/finalpagewizard/openediting" id="bm_id971404" 
localize="false"/><h2 id="par_idN1055B">Open the database for editing</h2>
 <paragraph role="paragraph" id="par_idN105C6" xml-lang="en-US"><ahelp 
hid=".">Select to display the database file, where you can edit the database 
structure.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/finalpagewizard/usewizard" 
id="bm_id1763359" localize="false"/><h2 id="par_idN1055F">Create tables using 
the table wizard</h2>
-<paragraph role="paragraph" id="par_idN105D1" xml-lang="en-US"><ahelp 
hid=".">Select to call the <link 
href="text/shared/explorer/database/tablewizard00.xhp">Table Wizard</link> 
after the Database Wizard is finished.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105D1" xml-lang="en-US"><ahelp 
hid=".">Select to call the <link href="text/sdatabase/tablewizard00.xhp">Table 
Wizard</link> after the Database Wizard is finished.</ahelp></paragraph>
 <paragraph role="paragraph" localize="false" id="par_idN1061A" 
xml-lang="en-US"><embedvar 
href="text/sdatabase/dabawiz00.xhp#databasewizardh1"/></paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/shared/explorer/database/tablewizard00.xhp 
b/source/text/sdatabase/tablewizard00.xhp
similarity index 73%
rename from source/text/shared/explorer/database/tablewizard00.xhp
rename to source/text/sdatabase/tablewizard00.xhp
index 767b2d0af..fd8c0b9eb 100644
--- a/source/text/shared/explorer/database/tablewizard00.xhp
+++ b/source/text/sdatabase/tablewizard00.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,12 +18,12 @@
  *   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="textsharedexplorerdatabasetablewizard00xml" indexer="include">
 <title id="tit" xml-lang="en-US">Table Wizard</title>
-<filename>/text/shared/explorer/database/tablewizard00.xhp</filename>
+<filename>/text/sdatabase/tablewizard00.xhp</filename>
 </topic>
 </meta>
 <body>
@@ -32,17 +32,17 @@
 <bookmark_value>Table Wizard (Base)</bookmark_value>
 </bookmark><comment>mw added "(Base)" to all entries</comment>
 <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_DIALOG" 
id="bm_id406201" localize="false"/>
-<paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1"><link 
href="text/shared/explorer/database/tablewizard00.xhp">Table 
Wizard</link></paragraph>
+<h1 id="par_idN1054C"><link href="text/sdatabase/tablewizard00.xhp">Table 
Wizard</link></h1>
 <paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US"><ahelp 
hid=".">The Table Wizard helps you to create a database 
table.</ahelp></paragraph>
 </section>
-<embed href="text/shared/explorer/database/tablewizard01.xhp#selecttable"/>
-<embed href="text/shared/explorer/database/tablewizard02.xhp#settype"/>
-<embed href="text/shared/explorer/database/tablewizard03.xhp#setprimary"/>
-<embed href="text/shared/explorer/database/tablewizard04.xhp#createtable"/>
+<embed href="text/sdatabase/tablewizard01.xhp#selecttable"/>
+<embed href="text/sdatabase/tablewizard02.xhp#settype"/>
+<embed href="text/sdatabase/tablewizard03.xhp#setprimary"/>
+<embed href="text/sdatabase/tablewizard04.xhp#createtable"/>
 <embed href="text/shared/00/00000001.xhp#back"/>
 <embed href="text/shared/00/00000001.xhp#next"/>
 <embed href="text/shared/00/00000001.xhp#finish"/>
 <embed href="text/shared/00/00000001.xhp#cancel"/>
-<paragraph role="paragraph" id="par_idN105AF" xml-lang="en-US"><link 
href="text/shared/explorer/database/tablewizard01.xhp" name="Table Wizard - 
Select fields">Table Wizard - Select fields</link></paragraph>
+<paragraph role="paragraph" id="par_idN105AF" xml-lang="en-US"><link 
href="text/sdatabase/tablewizard01.xhp" name="Table Wizard - Select 
fields">Table Wizard - Select fields</link></paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/shared/explorer/database/tablewizard01.xhp 
b/source/text/sdatabase/tablewizard01.xhp
similarity index 78%
rename from source/text/shared/explorer/database/tablewizard01.xhp
rename to source/text/sdatabase/tablewizard01.xhp
index 6f02a3373..d039a58e7 100644
--- a/source/text/shared/explorer/database/tablewizard01.xhp
+++ b/source/text/sdatabase/tablewizard01.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,27 +18,27 @@
  *   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="textsharedexplorerdatabasetablewizard01xml" indexer="include">
 <title id="tit" xml-lang="en-US">Table Wizard - Select Fields</title>
-<filename>/text/shared/explorer/database/tablewizard01.xhp</filename>
+<filename>/text/sdatabase/tablewizard01.xhp</filename>
 </topic>
 </meta>
 <body>
 <section id="selecttable">
-<paragraph role="heading" id="par_idN10546" xml-lang="en-US" level="1"><link 
href="text/shared/explorer/database/tablewizard01.xhp">Table Wizard - Select 
Fields</link></paragraph>
+<h1 id="par_idN10546"><link href="text/sdatabase/tablewizard01.xhp">Table 
Wizard - Select Fields</link></h1>
 <paragraph role="paragraph" id="par_idN10556" xml-lang="en-US">Select fields 
from the provided sample tables as a starting point to create your own 
table.</paragraph>
 </section>
 <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_OPTBUSINESS" 
id="bm_id9071932" localize="false"/>
-<paragraph role="heading" id="par_idN10559" xml-lang="en-US" 
level="2">Business</paragraph>
+<h2 id="par_idN10559">Business</h2>
 <paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US"><ahelp 
hid=".">Select the business category to see only business sample 
tables.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_OPTPRIVATE" 
id="bm_id5322428" localize="false"/>
-<paragraph role="heading" id="par_idN10560" xml-lang="en-US" 
level="2">Private</paragraph>
+<h2 id="par_idN10560">Private</h2>
 <paragraph role="paragraph" id="par_idN10564" xml-lang="en-US"><ahelp 
hid=".">Select the private category to see only private sample 
tables.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_LBTABLES" 
id="bm_id7499008" localize="false"/>
-<paragraph role="heading" id="par_idN10567" xml-lang="en-US" level="2">Sample 
tables</paragraph>
+<h2 id="par_idN10567">Sample tables</h2>
 <paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US"><ahelp 
hid=".">Select one of the sample tables. Then select fields from that table 
from the left list box. Repeat this step until you have selected all the fields 
that you need.</ahelp></paragraph>
 <embed href="text/shared/autopi/01090100.xhp#available_fields"/>
 <embed href="text/shared/autopi/01090100.xhp#take"/>
@@ -47,8 +47,8 @@
 <embed href="text/shared/autopi/01090100.xhp#remove_all"/>
 <embed href="text/shared/autopi/01090100.xhp#updown"/>
 <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_FIELDSSELECTED" 
id="bm_id6092104" localize="false"/>
-<paragraph role="heading" id="par_idN1059E" xml-lang="en-US" 
level="2">Selected Fields</paragraph>
+<h2 id="par_idN1059E">Selected Fields</h2>
 <paragraph role="paragraph" id="par_idN105A4" xml-lang="en-US"><ahelp 
hid=".">Displays all fields that will be included in the new 
table.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US"><link 
href="text/shared/explorer/database/tablewizard02.xhp" name="Table Wizard - Set 
types and formats">Table Wizard - Set types and formats</link></paragraph>
+<paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US"><link 
href="text/sdatabase/tablewizard02.xhp" name="Table Wizard - Set types and 
formats">Table Wizard - Set types and formats</link></paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/shared/explorer/database/tablewizard02.xhp 
b/source/text/sdatabase/tablewizard02.xhp
similarity index 70%
rename from source/text/shared/explorer/database/tablewizard02.xhp
rename to source/text/sdatabase/tablewizard02.xhp
index ac16b4f0c..59f972f45 100644
--- a/source/text/shared/explorer/database/tablewizard02.xhp
+++ b/source/text/sdatabase/tablewizard02.xhp
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -19,50 +16,48 @@
  *   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">
+<helpdocument version="1.0">
 <meta>
 <topic id="textsharedexplorerdatabasetablewizard02xml" indexer="include" 
status="PUBLISH">
 <title id="tit" xml-lang="en-US">Table Wizard - Set Types and Formats</title>
-<filename>/text/shared/explorer/database/tablewizard02.xhp</filename>
+<filename>/text/sdatabase/tablewizard02.xhp</filename>
 </topic>
 </meta>
 <body>
 <section id="settype">
-<paragraph role="heading" id="par_idN10552" xml-lang="en-US" level="1"><link 
href="text/shared/explorer/database/tablewizard02.xhp">Table Wizard - Set Types 
and Formats</link></paragraph>
+<h1 id="par_idN10552"><link href="text/sdatabase/tablewizard02.xhp">Table 
Wizard - Set Types and Formats</link></h1>
 <paragraph role="paragraph" id="par_idN10562" xml-lang="en-US">Specifies the 
field information for your selected fields.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_LB_SELFIELDNAMES" 
id="bm_id5365764" localize="false"/><paragraph role="heading" id="par_idN10565" 
xml-lang="en-US" level="2">Selected fields</paragraph>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_LB_SELFIELDNAMES" 
id="bm_id5365764" localize="false"/><h2 id="par_idN10565">Selected fields</h2>
 <paragraph role="paragraph" id="par_idN10569" xml-lang="en-US"><ahelp 
hid=".">Select a field in order to edit the field 
information.</ahelp></paragraph>
 <embed href="text/shared/autopi/01090100.xhp#updown"/>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CMDMINUS" 
id="bm_id8947111.00000001" localize="false"/><paragraph role="heading" 
id="par_idN10574" localize="false" level="3">−</paragraph>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CMDMINUS" 
id="bm_id8947111.00000001" localize="false"/><h3 id="par_idN10574">−</h3>
 <paragraph role="paragraph" id="par_idN10578" xml-lang="en-US"><ahelp 
hid=".">Remove the selected field from the list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CMDPLUS" 
id="bm_id7230140" localize="false"/><paragraph role="heading" id="par_idN1057B" 
xml-lang="en-US" level="3">+</paragraph>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CMDPLUS" 
id="bm_id7230140" localize="false"/><h3 id="par_idN1057B">+</h3>
 <paragraph role="paragraph" id="par_idN1057F" xml-lang="en-US"><ahelp 
hid=".">Add a new data field to the list box.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN10582" xml-lang="en-US" level="2">Field 
information</paragraph>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_COLNAME" 
id="bm_id1665089" localize="false"/><paragraph role="heading" id="par_idN10586" 
xml-lang="en-US" level="3">Field name</paragraph>
+<h2 id="par_idN10582">Field information</h2>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_COLNAME" 
id="bm_id1665089" localize="false"/><h3 id="par_idN10586">Field name</h3>
 <paragraph role="paragraph" id="par_idN1058A" xml-lang="en-US"><ahelp 
hid=".">Displays the name of the selected data field. If you want, you can 
enter a new name.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_TYPE" 
id="bm_id1665090" localize="false"/>
-<paragraph role="heading" id="par_idN1058D" xml-lang="en-US" level="3">Field 
type</paragraph>
+<h3 id="par_idN1058D">Field type</h3>
 <paragraph role="paragraph" id="par_idN10591" xml-lang="en-US"><ahelp 
hid=".">Select a field type.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_AUTOINCREMENT" 
id="bm_id1055330" localize="false"/><paragraph role="heading" id="hd_id5486922" 
xml-lang="en-US" level="3">AutoValue</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_AUTOINCREMENT" 
id="bm_id1055330" localize="false"/><h3 id="hd_id5486922">AutoValue</h3>
 <paragraph role="paragraph" id="par_id4198736" xml-lang="en-US"><ahelp 
hid=".">If set to Yes, the values for this data field are generated by the 
database engine.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_REQUIRED" 
id="bm_id3498336" localize="false"/><paragraph role="heading" id="par_idN106A0" 
xml-lang="en-US" level="3">Entry required</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_REQUIRED" 
id="bm_id3498336" localize="false"/><h3 id="par_idN106A0">Entry required</h3>
 <paragraph role="paragraph" id="par_idN106A6" xml-lang="en-US"><ahelp 
hid=".">If set to Yes, this field must not be empty.</ahelp><comment>not in 
spec doc</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_LEN" 
id="bm_id3498337" localize="false"/>
-<paragraph role="heading" id="par_idN10594" xml-lang="en-US" 
level="3">Length</paragraph>
+<h3 id="par_idN10594">Length</h3>
 <paragraph role="paragraph" id="par_idN10598" xml-lang="en-US"><ahelp 
hid=".">Specifies the number of characters for the data 
field.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_SCALE" 
id="bm_id3498338" localize="false"/>
-<paragraph role="heading" id="par_idN1059B" xml-lang="en-US" level="3">Decimal 
places</paragraph>
+<h3 id="par_idN1059B">Decimal places</h3>
 <paragraph role="paragraph" id="par_idN1059F" xml-lang="en-US"><ahelp 
hid=".">Specifies the number of decimal places for the data field. This option 
is only available for numerical or decimal data fields.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_ENT_BOOL_DEFAULT" 
id="bm_id3498339" localize="false"/>
-<paragraph role="heading" id="par_idN105A2" xml-lang="en-US" level="3">Default 
value</paragraph>
+<h3 id="par_idN105A2">Default value</h3>
 <paragraph role="paragraph" id="par_idN105A6" xml-lang="en-US"><ahelp 
hid=".">Specifies the default value for a Yes/No field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_AUTOINCREMENTVALUE" 
id="bm_id8732871.00000001" localize="false"/><paragraph role="heading" 
id="par_idN10730" xml-lang="en-US" level="3">Auto-increment 
statement</paragraph>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TAB_AUTOINCREMENTVALUE" 
id="bm_id8732871.00000001" localize="false"/><h3 
id="par_idN10730">Auto-increment statement</h3>
 <paragraph role="paragraph" id="par_id6706747" xml-lang="en-US"><ahelp 
hid=".">Enter the SQL command specifier that instructs the data source to 
auto-increment a specified Integer data field.</ahelp> For example, the 
following MySQL statement used the AUTO_INCREMENT statement to increase the 
"id" field each time the statement creates a data field:</paragraph>
 <paragraph role="code" id="par_id8946501" xml-lang="en-US">CREATE TABLE 
"table1" ("id" INTEGER AUTO_INCREMENT)</paragraph>
 <paragraph role="paragraph" id="par_id4846949" xml-lang="en-US">For this 
example, you must enter AUTO_INCREMENT into the Auto-increment statement 
box.</paragraph>
-<paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US"><link 
href="text/shared/explorer/database/tablewizard03.xhp" name="Table Wizard - Set 
primary key">Table Wizard - Set primary key</link></paragraph>
+<paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US"><link 
href="text/sdatabase/tablewizard03.xhp" name="Table Wizard - Set primary 
key">Table Wizard - Set primary key</link></paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/shared/explorer/database/tablewizard03.xhp 
b/source/text/sdatabase/tablewizard03.xhp
similarity index 77%
rename from source/text/shared/explorer/database/tablewizard03.xhp
rename to source/text/sdatabase/tablewizard03.xhp
index dabf01f8c..2862ca439 100644
--- a/source/text/shared/explorer/database/tablewizard03.xhp
+++ b/source/text/sdatabase/tablewizard03.xhp
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,14 +16,11 @@
  *   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="textsharedexplorerdatabasetablewizard03xml" indexer="include" 
status="PUBLISH">
 <title id="tit" xml-lang="en-US">Table Wizard - Set Primary Key</title>
-<filename>/text/shared/explorer/database/tablewizard03.xhp</filename>
+<filename>/text/sdatabase/tablewizard03.xhp</filename>
 </topic>
 <history>
 <created date="2004-07-06T15:25:35">UFI: new Table Wizard page 3</created>
@@ -33,36 +28,36 @@
 </meta>
 <body>
 <section id="setprimary">
-<paragraph role="heading" id="par_idN10546" xml-lang="en-US" level="1"><link 
href="text/shared/explorer/database/tablewizard03.xhp">Table Wizard - Set 
Primary Key</link></paragraph>
+<h1 id="par_idN10546"><link href="text/sdatabase/tablewizard03.xhp">Table 
Wizard - Set Primary Key</link></h1>
 <paragraph role="paragraph" id="par_idN10556" xml-lang="en-US">Specifies a 
field in the table to be used as a primary key.</paragraph>
 </section>
 <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CHK_USEPRIMEKEY" 
id="bm_id2796411" localize="false"/>
-<paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2">Create 
a primary key</paragraph>
+<h2 id="par_idN10559">Create a primary key</h2>
 <paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US"><ahelp 
hid=".">Select to create a primary key. Add a primary key to every database 
table to uniquely identify each record. For some database systems within 
%PRODUCTNAME, a primary key is mandatory for editing the 
tables.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_OPT_PK_AUTOMATIC" 
id="bm_id1500289" localize="false"/>
-<paragraph role="heading" id="par_idN10560" xml-lang="en-US" 
level="3">Automatically add a primary key</paragraph>
+<h3 id="par_idN10560">Automatically add a primary key</h3>
 <paragraph role="paragraph" id="par_idN10564" xml-lang="en-US"><ahelp 
hid=".">Select to automatically add a primary key as an additional 
field.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_OPT_PK_SINGLE" 
id="bm_id9485152.00000001" localize="false"/>
-<paragraph role="heading" id="par_idN10567" xml-lang="en-US" level="3">Use an 
existing field as a primary key</paragraph>
+<h3 id="par_idN10567">Use an existing field as a primary key</h3>
 <paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US"><ahelp 
hid=".">Select to use an existing field with unique values as a primary 
key.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_LB_PK_FIELDNAME" 
id="bm_id6801049" localize="false"/>
-<paragraph role="heading" id="par_idN1056E" xml-lang="en-US" level="4">Field 
name</paragraph>
+<h4 id="par_idN1056E">Field name</h4>
 <paragraph role="paragraph" id="par_idN10572" xml-lang="en-US"><ahelp 
hid=".">Select the field name.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE" 
id="bm_id8796349" localize="false"/>
 <bookmark xml-lang="en-US" 
branch="hid/WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC" id="bm_id1406292" 
localize="false"/>
-<paragraph role="heading" id="par_idN10575" xml-lang="en-US" level="4">Auto 
value</paragraph>
+<h4 id="par_idN10575">Auto value</h4>
 <paragraph role="paragraph" id="par_idN10579" xml-lang="en-US"><ahelp 
hid=".">Select to automatically insert a value and increment the field's value 
for each new record. The database must support automatic incrementation in 
order to use the <emph>Auto value</emph> feature.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_OPT_PK_SEVERAL" 
id="bm_id130008" localize="false"/>
-<paragraph role="heading" id="par_idN1057C" xml-lang="en-US" level="3">Define 
primary key by several fields</paragraph>
+<h3 id="par_idN1057C">Define primary key by several fields</h3>
 <paragraph role="paragraph" id="par_idN10580" xml-lang="en-US"><ahelp 
hid=".">Select to create a primary key from a combination of several existing 
fields.</ahelp></paragraph>
 <bookmark xml-lang="en-US" 
branch="hid/WIZARDS_HID_DLGTABLE_FIELDS_PK_AVAILABLE" id="bm_id2555009" 
localize="false"/>
-<paragraph role="heading" id="par_idN10583" xml-lang="en-US" 
level="4">Available fields</paragraph>
+<h4 id="par_idN10583">Available fields</h4>
 <paragraph role="paragraph" id="par_idN10587" xml-lang="en-US"><ahelp 
hid=".">Select a field and click &gt; to add it to the list of primary key 
fields.</ahelp></paragraph>
 <embed href="text/shared/autopi/01090100.xhp#take"/>
 <embed href="text/shared/autopi/01090100.xhp#remove"/>
 <bookmark xml-lang="en-US" 
branch="hid/WIZARDS_HID_DLGTABLE_FIELDS_PK_SELECTED" id="bm_id8829309" 
localize="false"/>
-<paragraph role="heading" id="par_idN1059A" xml-lang="en-US" level="4">Primary 
key fields</paragraph>
+<h4 id="par_idN1059A">Primary key fields</h4>
 <paragraph role="paragraph" id="par_idN1059E" xml-lang="en-US"><ahelp 
hid=".">Select a field and click &lt; to remove it from the list of primary key 
fields. The primary key is created as a concatenation of the fields in this 
list, from top to bottom.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN105A1" xml-lang="en-US"><link 
href="text/shared/explorer/database/tablewizard04.xhp" name="Table Wizard - 
Create table">Table Wizard - Create table</link></paragraph>
+<paragraph role="paragraph" id="par_idN105A1" xml-lang="en-US"><link 
href="text/sdatabase/tablewizard04.xhp" name="Table Wizard - Create 
table">Table Wizard - Create table</link></paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/shared/explorer/database/tablewizard04.xhp 
b/source/text/sdatabase/tablewizard04.xhp
similarity index 76%
rename from source/text/shared/explorer/database/tablewizard04.xhp
rename to source/text/sdatabase/tablewizard04.xhp
index 627fc8a8a..a1144970c 100644
--- a/source/text/shared/explorer/database/tablewizard04.xhp
+++ b/source/text/sdatabase/tablewizard04.xhp
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,12 +16,11 @@
  *   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="textsharedexplorerdatabasetablewizard04xml" indexer="include" 
status="PUBLISH">
 <title id="tit" xml-lang="en-US">Table Wizard - Create Table</title>
-<filename>/text/shared/explorer/database/tablewizard04.xhp</filename>
+<filename>/text/sdatabase/tablewizard04.xhp</filename>
 </topic>
 <history>
 <created date="2004-07-06T15:43:51">UFI: new Table Wizard page 4</created>
@@ -31,27 +28,27 @@
 </meta>
 <body>
 <section id="createtable">
-<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1"><link 
href="text/shared/explorer/database/tablewizard04.xhp">Table Wizard - Create 
Table</link></paragraph>
+<h1 id="par_idN10543"><link href="text/sdatabase/tablewizard04.xhp">Table 
Wizard - Create Table</link></h1>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US">Enter a name 
for the table and specify whether you want to modify the table after the wizard 
is finished.</paragraph>
 </section>
 <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_TXT_NAME" 
id="bm_id6823633" localize="false"/>
-<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2">Table 
name</paragraph>
+<h2 id="par_idN10556">Table name</h2>
 <paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US"><ahelp 
hid=".">Specifies the table name.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_LST_CATALOG" 
id="bm_id3157139" localize="false"/>
-<paragraph role="heading" id="par_idN105E4" xml-lang="en-US" level="2">Catalog 
of the table</paragraph>
+<h2 id="par_idN105E4">Catalog of the table</h2>
 <paragraph role="paragraph" id="par_idN105EA" xml-lang="en-US"><ahelp 
hid=".">Select the catalog for the table. (Available only if the database 
supports catalogs)</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_LST_SCHEMA" 
id="bm_id2800683" localize="false"/>
-<paragraph role="heading" id="par_idN10605" xml-lang="en-US" level="2">Schema 
of the table</paragraph>
+<h2 id="par_idN10605">Schema of the table</h2>
 <paragraph role="paragraph" id="par_idN1060B" xml-lang="en-US"><ahelp 
hid=".">Select the schema for the table. (Available only if the database 
supports schemas)</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_OPT_WORKWITHTABLE" 
id="bm_id5238807" localize="false"/>
-<paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="2">Modify 
the table design</paragraph>
+<h2 id="par_idN1055D">Modify the table design</h2>
 <paragraph role="paragraph" id="par_idN10561" xml-lang="en-US"><ahelp 
hid=".">Select to save and edit the table design.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE" 
id="bm_id2086855" localize="false"/>
-<paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2">Insert 
data immediately</paragraph>
+<h2 id="par_idN10564">Insert data immediately</h2>
 <paragraph role="paragraph" id="par_idN10568" xml-lang="en-US"><ahelp 
hid=".">Select to save the table design and open the table to enter 
data.</ahelp></paragraph>
 <bookmark xml-lang="en-US" 
branch="hid/WIZARDS_HID_DLGTABLE_OPT_STARTFORMWIZARD" id="bm_id3381145" 
localize="false"/>
-<paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="2">Create 
a form based on this table</paragraph>
+<h2 id="par_idN1056B">Create a form based on this table</h2>
 <paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US"><ahelp 
hid=".">Select to create a form based on this table. The form is created on a 
text document with the last used settings of the <link 
href="text/shared/autopi/01090000.xhp">Form Wizard</link>.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN10580" xml-lang="en-US"><link 
href="text/shared/explorer/database/tablewizard00.xhp" name="Table 
Wizard">Table Wizard</link></paragraph>
+<paragraph role="paragraph" id="par_idN10580" xml-lang="en-US"><link 
href="text/sdatabase/tablewizard00.xhp" name="Table Wizard">Table 
Wizard</link></paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/shared/guide/data_new.xhp 
b/source/text/shared/guide/data_new.xhp
index 12b282096..c334ced60 100644
--- a/source/text/shared/guide/data_new.xhp
+++ b/source/text/shared/guide/data_new.xhp
@@ -39,7 +39,7 @@
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_idN105DD" xml-lang="en-US">In the Database 
Wizard, select the type of database, and select the option to open the Table 
Wizard as the next wizard.</paragraph>
-<paragraph role="paragraph" id="par_idN105E0" xml-lang="en-US">The <link 
href="text/shared/explorer/database/tablewizard00.xhp">Table Wizard</link> 
helps you to add a table to the new database file.</paragraph>
+<paragraph role="paragraph" id="par_idN105E0" xml-lang="en-US">The <link 
href="text/sdatabase/tablewizard00.xhp">Table Wizard</link> helps you to add a 
table to the new database file.</paragraph>
 </listitem>
 </list>
 <section id="relatedtopics">
diff --git a/source/text/shared/guide/data_tables.xhp 
b/source/text/shared/guide/data_tables.xhp
index 8b3ecfcce..76e92039b 100644
--- a/source/text/shared/guide/data_tables.xhp
+++ b/source/text/shared/guide/data_tables.xhp
@@ -38,7 +38,7 @@
 </variable></paragraph>
 <paragraph role="paragraph" id="par_idN10617" xml-lang="en-US">Data is stored 
in tables. As an example, your system address book that you use for your email 
addresses is a table of the address book database. Each address is a data 
record, presented as a row in that table. The data records consist of data 
fields, for example the first and the last name fields and the email 
field.</paragraph>
 <paragraph role="heading" id="par_idN1061A" xml-lang="en-US" 
level="2">Creating a New Table With the Table Wizard</paragraph>
-<paragraph role="paragraph" id="par_idN1061E" xml-lang="en-US">In %PRODUCTNAME 
you can create a new table using the <link 
href="text/shared/explorer/database/tablewizard00.xhp">Table 
Wizard</link>:</paragraph>
+<paragraph role="paragraph" id="par_idN1061E" xml-lang="en-US">In %PRODUCTNAME 
you can create a new table using the <link 
href="text/sdatabase/tablewizard00.xhp">Table Wizard</link>:</paragraph>
 <list type="ordered">
 <listitem>
 <paragraph role="paragraph" id="par_idN10632" xml-lang="en-US">Open the 
database file where you want to create the new table.</paragraph>
diff --git a/source/text/shared/guide/database_main.xhp 
b/source/text/shared/guide/database_main.xhp
index 3ad0d52be..6a142d000 100644
--- a/source/text/shared/guide/database_main.xhp
+++ b/source/text/shared/guide/database_main.xhp
@@ -54,7 +54,7 @@
 <paragraph role="paragraph" id="par_id3155430" xml-lang="en-US"><link 
href="text/shared/01/05340400.xhp" name="Enter, edit and copy records">Enter, 
edit and copy records</link></paragraph>
 <h2 id="hd_id3147287">Tables</h2>
 <paragraph role="paragraph" id="par_id3163713" xml-lang="en-US"><link 
href="text/sdatabase/05010000.xhp" name="Create new table, edit table 
structure">Create new table, edit table structure</link>, <link 
href="text/sdatabase/05010100.xhp" name="index">index</link>, <link 
href="text/sdatabase/05020000.xhp" name="relations">relations</link></paragraph>
-<paragraph role="paragraph" id="par_idN1078F" xml-lang="en-US"><link 
href="text/shared/explorer/database/tablewizard00.xhp">Table 
Wizard</link></paragraph>
+<paragraph role="paragraph" id="par_idN1078F" xml-lang="en-US"><link 
href="text/sdatabase/tablewizard00.xhp">Table Wizard</link></paragraph>
 <paragraph role="paragraph" id="par_id3159196" xml-lang="en-US"><link 
href="text/shared/01/05340400.xhp" name="Enter, edit and copy records">Enter, 
edit and copy records</link></paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/shared/guide/main.xhp 
b/source/text/shared/guide/main.xhp
index 4ef130e21..c962100ac 100644
--- a/source/text/shared/guide/main.xhp
+++ b/source/text/shared/guide/main.xhp
@@ -114,7 +114,7 @@
 
 <h2 id="hd_id3152576" xml-lang="en-US">Data Sources</h2>
 <paragraph id="par_idN10826" role="paragraph" xml-lang="en-US"><link 
href="text/sdatabase/main.xhp">Working with databases in 
%PRODUCTNAME</link></paragraph>
-<paragraph id="par_idN10841" role="paragraph" xml-lang="en-US"><link 
href="text/shared/explorer/database/tablewizard00.xhp">Table 
Wizard</link></paragraph>
+<paragraph id="par_idN10841" role="paragraph" xml-lang="en-US"><link 
href="text/sdatabase/tablewizard00.xhp">Table Wizard</link></paragraph>
 <paragraph id="par_idN1085B" role="paragraph" xml-lang="en-US"><link 
href="text/shared/explorer/database/querywizard00.xhp">Query 
Wizard</link></paragraph>
 <paragraph id="par_idN10875" role="paragraph" xml-lang="en-US"><link 
href="text/shared/autopi/01090000.xhp">Forms Wizard</link></paragraph>
 <paragraph id="par_id3154011" role="paragraph" xml-lang="en-US"><link 
href="text/shared/autopi/01100000.xhp">Report Wizard</link></paragraph>

Reply via email to