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

2022-01-21 Thread Olivier Hallot (via logerrit)
 AllLangHelp_sdatabase.mk  |7 ++
 AllLangHelp_shared.mk |   10 -
 source/text/sdatabase/menuinsert.xhp  |2 -
 source/text/sdatabase/rep_datetime.xhp|   17 +--
 source/text/sdatabase/rep_insertfield.xhp |   14 ++---
 source/text/sdatabase/rep_main.xhp|   32 +++---
 source/text/sdatabase/rep_navigator.xhp   |   17 +--
 source/text/sdatabase/rep_pagenumbers.xhp |   17 +--
 source/text/sdatabase/rep_prop.xhp|8 +++
 source/text/sdatabase/rep_sort.xhp|8 +++
 source/text/shared/guide/data_report.xhp  |2 -
 source/text/shared/guide/data_reports.xhp |2 -
 12 files changed, 59 insertions(+), 77 deletions(-)

New commits:
commit 4eecbf9045ed866b0d716a45046f89b472dd3835
Author: Olivier Hallot 
AuthorDate: Fri Jan 21 13:45:51 2022 -0300
Commit: Olivier Hallot 
CommitDate: Fri Jan 21 17:59:51 2022 +0100

Refactor database Help files

Change-Id: I8f8c96bf9cc9c401c38e3cc92f4c3b274b3f15e8
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128740
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index 6d607cb60..7f7ff77dd 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -89,6 +89,13 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
 helpcontent2/source/text/sdatabase/tablewizard02 \
 helpcontent2/source/text/sdatabase/tablewizard03 \
 helpcontent2/source/text/sdatabase/tablewizard04 \
+helpcontent2/source/text/sdatabase/rep_datetime \
+helpcontent2/source/text/sdatabase/rep_insertfield \
+helpcontent2/source/text/sdatabase/rep_main \
+helpcontent2/source/text/sdatabase/rep_navigator \
+helpcontent2/source/text/sdatabase/rep_pagenumbers \
+helpcontent2/source/text/sdatabase/rep_prop \
+helpcontent2/source/text/sdatabase/rep_sort \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 77c368560..2f3c9b40a 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -873,14 +873,4 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/optionen/viewcertificate_g \
 ))
 
-$(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
-helpcontent2/source/text/shared/explorer/database/rep_datetime \
-helpcontent2/source/text/shared/explorer/database/rep_insertfield \
-helpcontent2/source/text/shared/explorer/database/rep_main \
-helpcontent2/source/text/shared/explorer/database/rep_navigator \
-helpcontent2/source/text/shared/explorer/database/rep_pagenumbers \
-helpcontent2/source/text/shared/explorer/database/rep_prop \
-helpcontent2/source/text/shared/explorer/database/rep_sort \
-,shared/explorer/database))
-
 # vim: set noet sw=4 ts=4:
diff --git a/source/text/sdatabase/menuinsert.xhp 
b/source/text/sdatabase/menuinsert.xhp
index 1f9196bc0..14be6017b 100644
--- a/source/text/sdatabase/menuinsert.xhp
+++ b/source/text/sdatabase/menuinsert.xhp
@@ -31,7 +31,7 @@
 Form
 Opens a new text document in form mode.
 Report
-Starts the Report Builder window 
for the selected table, view, or query.
+Starts the Report 
Builder window for the selected table, view, or 
query.
 Query (Design View)
 Opens a new query in design mode.
 Query (SQL View)
diff --git a/source/text/shared/explorer/database/rep_datetime.xhp 
b/source/text/sdatabase/rep_datetime.xhp
similarity index 82%
rename from source/text/shared/explorer/database/rep_datetime.xhp
rename to source/text/sdatabase/rep_datetime.xhp
index d45f7fe46..72a8dbbb3 100644
--- a/source/text/shared/explorer/database/rep_datetime.xhp
+++ b/source/text/sdatabase/rep_datetime.xhp
@@ -1,7 +1,4 @@
 
-
-
-
 
-
-
-   
+
 
 
 Date and Time
-/text/shared/explorer/database/rep_datetime.xhp
+/text/sdatabase/rep_datetime.xhp
 
 
 
 
 
 
-Date and Time
-
-You can open the Date and Time dialog of the Report Builder by 
choosing Insert - Date and 
Time.
-Press Shift-F1 and point with the mouse at an input box to see 
a help text for this input box.
+Date and Time
+
+You can open the Date and Time dialog of the Report Builder by choosing Insert - Date and Time.
+Press Shift-F1 and point 
with the mouse at an input box to see a help text for this input box.
 Enable Include Date to insert a date field into 
the active area of the report. The date field displays the current date when 
the report is executed.
 
 Select a format to display the date.
diff --git a/source/text/shared/explorer/database/rep_insertfield.xhp 
b/source/text/sdatabase/rep_insertfield.xhp
similarity index 88%
rename from source/text/shared/explorer/database/rep_insertfield.xhp
rename to source/text/sdatabase/rep_insertfield.xhp
index 6080bfd83..739e5254d 100644
--- a/source/text/shared/explorer/database/rep_insertfield.xhp
+++ b/source/text/sdatabase/rep_insertfield.xhp
@@ -12,7 +12

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

2021-12-24 Thread Olivier Hallot (via logerrit)
 AllLangHelp_sdatabase.mk   |9 +
 AllLangHelp_shared.mk  |9 -
 source/text/sdatabase/querywizard00.xhp|   28 ++--
 source/text/sdatabase/querywizard01.xhp|   16 
 source/text/sdatabase/querywizard02.xhp|   17 +++--
 source/text/sdatabase/querywizard03.xhp|   19 ---
 source/text/sdatabase/querywizard04.xhp|   21 +
 source/text/sdatabase/querywizard05.xhp|   14 +++---
 source/text/sdatabase/querywizard06.xhp|   19 ---
 source/text/sdatabase/querywizard07.xhp|   11 ---
 source/text/sdatabase/querywizard08.xhp|   17 +++--
 source/text/shared/guide/data_queries.xhp  |2 +-
 source/text/shared/guide/database_main.xhp |2 +-
 source/text/shared/guide/main.xhp  |2 +-
 14 files changed, 84 insertions(+), 102 deletions(-)

New commits:
commit 215707177c272f9fcf73a79b9150fe677b991716
Author: Olivier Hallot 
AuthorDate: Fri Dec 24 11:32:32 2021 -0300
Commit: Olivier Hallot 
CommitDate: Fri Dec 24 17:57:56 2021 +0100

Refactor database files

Change-Id: If6acf26ea094234d06522c26c8bb8274c0abdaa5
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/127430
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index 736b1abb4..6d607cb60 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -75,6 +75,15 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
 helpcontent2/source/text/sdatabase/menuview \
 helpcontent2/source/text/sdatabase/migrate_macros \
 helpcontent2/source/text/sdatabase/password \
+helpcontent2/source/text/sdatabase/querywizard00 \
+helpcontent2/source/text/sdatabase/querywizard01 \
+helpcontent2/source/text/sdatabase/querywizard02 \
+helpcontent2/source/text/sdatabase/querywizard03 \
+helpcontent2/source/text/sdatabase/querywizard04 \
+helpcontent2/source/text/sdatabase/querywizard05 \
+helpcontent2/source/text/sdatabase/querywizard06 \
+helpcontent2/source/text/sdatabase/querywizard07 \
+helpcontent2/source/text/sdatabase/querywizard08 \
 helpcontent2/source/text/sdatabase/tablewizard00 \
 helpcontent2/source/text/sdatabase/tablewizard01 \
 helpcontent2/source/text/sdatabase/tablewizard02 \
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 6e19148d1..03f5e3d5b 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -870,15 +870,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 ))
 
 $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
-helpcontent2/source/text/shared/explorer/database/querywizard00 \
-helpcontent2/source/text/shared/explorer/database/querywizard01 \
-helpcontent2/source/text/shared/explorer/database/querywizard02 \
-helpcontent2/source/text/shared/explorer/database/querywizard03 \
-helpcontent2/source/text/shared/explorer/database/querywizard04 \
-helpcontent2/source/text/shared/explorer/database/querywizard05 \
-helpcontent2/source/text/shared/explorer/database/querywizard06 \
-helpcontent2/source/text/shared/explorer/database/querywizard07 \
-helpcontent2/source/text/shared/explorer/database/querywizard08 \
 helpcontent2/source/text/shared/explorer/database/rep_datetime \
 helpcontent2/source/text/shared/explorer/database/rep_insertfield \
 helpcontent2/source/text/shared/explorer/database/rep_main \
diff --git a/source/text/shared/explorer/database/querywizard00.xhp 
b/source/text/sdatabase/querywizard00.xhp
similarity index 64%
rename from source/text/shared/explorer/database/querywizard00.xhp
rename to source/text/sdatabase/querywizard00.xhp
index ffe747400..314f14c93 100644
--- a/source/text/shared/explorer/database/querywizard00.xhp
+++ b/source/text/sdatabase/querywizard00.xhp
@@ -1,6 +1,6 @@
 
 
-   
+
 
- 
-   
+
+
 
 
 Query Wizard
-/text/shared/explorer/database/querywizard00.xhp
+/text/sdatabase/querywizard00.xhp
 
 
 
 mw deleted 2 index entries
 
-Query 
Wizard
+Query 
Wizard
 The Query Wizard helps you to design a database query. The 
saved query can be called later, either from the graphical user interface, or 
using the automatically created SQL language command.
 
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
 
 
 
 
-Query Wizard - Field selection
+Query Wizard - Field selection
 
 
diff --git a/source/text/shared/explorer/database/querywizard01.xhp 
b/source/text/sdatabase/querywizard01.xhp
similarity index 79%
rename from source/text/shared/explorer/database/querywizard01.xhp
rename to source/text/sdatabase/querywizard01.xhp
index 16eb42baa..7570c3daa 100644
--- a/source/text/shared/explorer/database/querywizard01.xhp
+++ b/source/text/sdatabase/querywizard01.xhp
@@ -1,6 +1,6 @@
 
 
-   
+
 
- 
-   
+
+
 
 
 Query Wizard - Field Selection
-/text/shared/explorer/database/q

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

2021-12-09 Thread Olivier Hallot (via logerrit)
 AllLangHelp_sdatabase.mk |2 ++
 AllLangHelp_shared.mk|2 --
 source/text/sdatabase/migrate_macros.xhp |4 ++--
 source/text/sdatabase/password.xhp   |   13 +
 source/text/shared/00/0001.xhp   |4 +++-
 5 files changed, 12 insertions(+), 13 deletions(-)

New commits:
commit 074f4a0f8b985a01c970d3d0bd9329d4e3c2634a
Author: Olivier Hallot 
AuthorDate: Thu Dec 9 10:44:42 2021 -0300
Commit: Olivier Hallot 
CommitDate: Thu Dec 9 15:31:13 2021 +0100

Refactor database Help files

+ remove duplicate ID in a section

Change-Id: Id398144f06a813d0ac90bf5d5a4e10bc8cd0f1d3
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/126612
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index a83735de4..736b1abb4 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -73,6 +73,8 @@ $(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/migrate_macros \
+helpcontent2/source/text/sdatabase/password \
 helpcontent2/source/text/sdatabase/tablewizard00 \
 helpcontent2/source/text/sdatabase/tablewizard01 \
 helpcontent2/source/text/sdatabase/tablewizard02 \
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 2642366a7..6e19148d1 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -870,8 +870,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 ))
 
 $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
-helpcontent2/source/text/shared/explorer/database/migrate_macros \
-helpcontent2/source/text/shared/explorer/database/password \
 helpcontent2/source/text/shared/explorer/database/querywizard00 \
 helpcontent2/source/text/shared/explorer/database/querywizard01 \
 helpcontent2/source/text/shared/explorer/database/querywizard02 \
diff --git a/source/text/shared/explorer/database/migrate_macros.xhp 
b/source/text/sdatabase/migrate_macros.xhp
similarity index 95%
rename from source/text/shared/explorer/database/migrate_macros.xhp
rename to source/text/sdatabase/migrate_macros.xhp
index 736498f3f..0db2c0014 100644
--- a/source/text/shared/explorer/database/migrate_macros.xhp
+++ b/source/text/sdatabase/migrate_macros.xhp
@@ -23,7 +23,7 @@
 
   
  Migrate Macros
- /text/shared/explorer/database/migrate_macros.xhp
+ /text/sdatabase/migrate_macros.xhp
   


@@ -37,7 +37,7 @@
 
 
 
-Migrate 
Macros
+Migrate Macros
 
 The Database Document Macro Migration Wizard 
moves existing macros from sub-documents of an old Base file into the new Base 
file's macro storage area.
   
diff --git a/source/text/shared/explorer/database/password.xhp 
b/source/text/sdatabase/password.xhp
similarity index 81%
rename from source/text/shared/explorer/database/password.xhp
rename to source/text/sdatabase/password.xhp
index e51fdde2c..770fe6b7e 100644
--- a/source/text/shared/explorer/database/password.xhp
+++ b/source/text/sdatabase/password.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-   
 
 
 
 User Name and Password Required
-/text/shared/explorer/database/password.xhp
+/text/sdatabase/password.xhp
 
 
 Password dialog
 
 
 
-User 
Name and Password Required
+User Name and Password Required
 
-User 
name
+User name
 Enter the user name to connect to the data source.
 
-Password
+Password
 Enter the password to connect to the data source.
 
-Remember password till end of session
+Remember password till end of session
 Select to use the same user name and password without further dialog, 
when you connect again to the same data source in the current %PRODUCTNAME 
session.
 
 
diff --git a/source/text/shared/00/0001.xhp 
b/source/text/shared/00/0001.xhp
index 7f397d6d7..c98becce1 100644
--- a/source/text/shared/00/0001.xhp
+++ b/source/text/shared/00/0001.xhp
@@ -39,12 +39,14 @@
 Cancel
   Clicking Cancel closes a dialog without saving any changes 
made.
 
+
 
 
 
 Finish
   Applies all changes and closes the wizard.
 
+
 
 Toolbars
   By clicking 
the arrow next to some icons you open a toolbar. To move a toolbar, drag the 
title bar. As soon as you release the mouse button, the toolbar remains at the 
new position. Drag the title bar to another position, or drag to an edge of the 
window, where the toolbar will dock. Close a toolbar by clicking the 
Close Window icon. Make the toolbar visible again by choosing 
View - Toolbars - (toolbar name).
@@ -201,7 +203,7 @@
 Reset
   Resets modified values back to the tab 
page previous values.
 
-
+
 Cancel
   Closes dialog and discards all 
changes.
 


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

2021-11-18 Thread Olivier Hallot (via logerrit)
 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 
AuthorDate: Thu Nov 18 15:11:55 2021 -0300
Commit: Olivier Hallot 
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 

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 @@
 Open the database for editing
 Select to display the database file, where you can edit the database 
structure.
 Create tables using 
the table wizard
-Select to call the Table Wizard 
after the Database Wizard is finished.
+Select to call the Table 
Wizard after the Database Wizard is finished.
 
 
 
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 @@
 
 
-   
+
 
- 
-   
+
+
 
 
 Table Wizard
-/text/shared/explorer/database/tablewizard00.xhp
+/text/sdatabase/tablewizard00.xhp
 
 
 
@@ -32,17 +32,17 @@
 Table Wizard (Base)
 mw added "(Base)" to all entries
 
-Table 
Wizard
+Table 
Wizard
 The Table Wizard helps you to create a database 
table.
 
-
-
-
-
+
+
+
+
 
 
 
 
-Table Wizard - Select fields
+Table Wizard - Select fields
 
 
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 @@
 
 
-   
+
 
- 
-   
+
+
 
 
 Table Wizard - Select Fields
-/text/shared/explorer/database/tablewizard01.xhp
+/text/sdatabase/tablewizard01.xhp
 
 
 
 
-Table Wizard - Select 
Fields
+Table 
Wizard - Select Fields
 Select fields 
from the provided sample tables as a starting point to create your own 
table.
 
 
-Business
+Business
 Select the business category to see only business sample 
tables.
 
-Private
+Private
 Select the private category to see only private sample 
tables.
 
-Sample 
tables
+

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

2021-11-02 Thread Olivier Hallot (via logerrit)
 AllLangHelp_sdatabase.mk   |7 +
 AllLangHelp_shared.mk  |7 -
 source/text/sdatabase/main.xhp |2 -
 source/text/sdatabase/menubar.xhp  |   19 +-
 source/text/sdatabase/menuedit.xhp |   39 +
 source/text/sdatabase/menufile.xhp |   23 +++--
 source/text/sdatabase/menufilesave.xhp |   12 
 source/text/sdatabase/menuinsert.xhp   |   27 
 source/text/sdatabase/menutools.xhp|   15 ---
 source/text/sdatabase/menuview.xhp |   33 +++-
 source/text/shared/guide/database_main.xhp |2 -
 11 files changed, 83 insertions(+), 103 deletions(-)

New commits:
commit 95f006af3ffbe256ebf095db8be2ebd1321e673e
Author: Olivier Hallot 
AuthorDate: Mon Nov 1 15:21:09 2021 -0300
Commit: Olivier Hallot 
CommitDate: Tue Nov 2 08:04:48 2021 +0100

Refactor database files

Change-Id: I97f41e7a5268ee307e3e0b051abebb35b917ed73
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/124565
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index 53b5e7db4..a2ad6311e 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -66,6 +66,13 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
 helpcontent2/source/text/sdatabase/dabawiz02spreadsheet \
 helpcontent2/source/text/sdatabase/dabawiz02text \
 helpcontent2/source/text/sdatabase/dabawiz03auth \
+helpcontent2/source/text/sdatabase/menubar \
+helpcontent2/source/text/sdatabase/menuedit \
+helpcontent2/source/text/sdatabase/menufile \
+helpcontent2/source/text/sdatabase/menufilesave \
+helpcontent2/source/text/sdatabase/menuinsert \
+helpcontent2/source/text/sdatabase/menutools \
+helpcontent2/source/text/sdatabase/menuview \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 1d8258596..e758a8330 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -870,13 +870,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 ))
 
 $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
-helpcontent2/source/text/shared/explorer/database/menubar \
-helpcontent2/source/text/shared/explorer/database/menuedit \
-helpcontent2/source/text/shared/explorer/database/menufile \
-helpcontent2/source/text/shared/explorer/database/menufilesave \
-helpcontent2/source/text/shared/explorer/database/menuinsert \
-helpcontent2/source/text/shared/explorer/database/menutools \
-helpcontent2/source/text/shared/explorer/database/menuview \
 helpcontent2/source/text/shared/explorer/database/migrate_macros \
 helpcontent2/source/text/shared/explorer/database/password \
 helpcontent2/source/text/shared/explorer/database/querywizard00 \
diff --git a/source/text/sdatabase/main.xhp b/source/text/sdatabase/main.xhp
index 806e88419..f76bead79 100644
--- a/source/text/sdatabase/main.xhp
+++ b/source/text/sdatabase/main.xhp
@@ -87,7 +87,7 @@

 
 
-   
+   
 
 

diff --git a/source/text/shared/explorer/database/menubar.xhp 
b/source/text/sdatabase/menubar.xhp
similarity index 70%
rename from source/text/shared/explorer/database/menubar.xhp
rename to source/text/sdatabase/menubar.xhp
index 59919db15..7542609df 100644
--- a/source/text/shared/explorer/database/menubar.xhp
+++ b/source/text/sdatabase/menubar.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-   
 
 
 
 Menus
-/text/shared/explorer/database/menubar.xhp
+/text/sdatabase/menubar.xhp
 
 
 UFI: Database Document Menu bar
@@ -31,14 +28,14 @@
 
 
 
-Menus
-
+Menus
+
 In the database 
window, you see a new set of menu commands for working on the current database 
file.
 
-
-
-
-
-
+
+
+
+
+
 
 
diff --git a/source/text/shared/explorer/database/menuedit.xhp 
b/source/text/sdatabase/menuedit.xhp
similarity index 73%
rename from source/text/shared/explorer/database/menuedit.xhp
rename to source/text/sdatabase/menuedit.xhp
index 4fc35cfc5..bdb4046a8 100644
--- a/source/text/shared/explorer/database/menuedit.xhp
+++ b/source/text/sdatabase/menuedit.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-
 
 
 
 Edit
-/text/shared/explorer/database/menuedit.xhp
+/text/sdatabase/menuedit.xhp
 
 
 UFI: Edit menu of Database
@@ -31,56 +28,56 @@
 
 
 
-Edit
+Edit
 
 The Edit menu 
of a database window.
-Copy
+Copy
 Copies the selected object to the clipboard.
-Paste
+Paste
 Inserts an item from the clipboard. If you want, you can insert forms 
and reports, including subfolders, from one database file to 
another.
 
-Paste 
Special
+Paste Special
 Inserts an item from the clipboard. If you want, you can insert forms 
and reports, including subfolders, from one database file to 
another.
 
 
-Select 
All
+Select All
 Selects all entries, including subfolders, in the lower part of the 
database window.
 
 
-Edit
+Edit
 Opens a window where 

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

2021-10-19 Thread Olivier Hallot (via logerrit)
 AllLangHelp_sdatabase.mk   |   10 ++
 AllLangHelp_shared.mk  |   10 --
 source/text/sdatabase/dabawiz00.xhp|   20 ++--
 source/text/sdatabase/dabawiz01.xhp|   18 +-
 source/text/sdatabase/dabawiz02.xhp|4 ++--
 source/text/sdatabase/dabawiz02access.xhp  |4 ++--
 source/text/sdatabase/dabawiz02ado.xhp |4 ++--
 source/text/sdatabase/dabawiz02dbase.xhp   |4 ++--
 source/text/sdatabase/dabawiz02jdbc.xhp|4 ++--
 source/text/sdatabase/dabawiz02mysql.xhp   |8 
 source/text/sdatabase/dabawiz02odbc.xhp|4 ++--
 source/text/sdatabase/dabawiz02oracle.xhp  |2 +-
 source/text/sdatabase/dabawiz02spreadsheet.xhp |2 +-
 source/text/sdatabase/dabawiz02text.xhp|2 +-
 source/text/sdatabase/dabawiz03auth.xhp|2 +-
 15 files changed, 49 insertions(+), 49 deletions(-)

New commits:
commit 08deb44ef2fdac4a1e173da75c9cdc1dfe289c61
Author: Olivier Hallot 
AuthorDate: Tue Oct 19 13:36:05 2021 -0300
Commit: Olivier Hallot 
CommitDate: Tue Oct 19 19:01:25 2021 +0200

Refactor database Help files (connection wizard)

Change-Id: I2d924cb3611d8749ed1e19d9321b1f230697412e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/123831
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index e0c62d192..53b5e7db4 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -55,6 +55,16 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
 helpcontent2/source/text/sdatabase/dabapropgen \
 helpcontent2/source/text/sdatabase/dabawiz00 \
 helpcontent2/source/text/sdatabase/dabawiz01 \
+helpcontent2/source/text/sdatabase/dabawiz02 \
+helpcontent2/source/text/sdatabase/dabawiz02access \
+helpcontent2/source/text/sdatabase/dabawiz02ado \
+helpcontent2/source/text/sdatabase/dabawiz02dbase \
+helpcontent2/source/text/sdatabase/dabawiz02jdbc \
+helpcontent2/source/text/sdatabase/dabawiz02mysql \
+helpcontent2/source/text/sdatabase/dabawiz02odbc \
+helpcontent2/source/text/sdatabase/dabawiz02oracle \
+helpcontent2/source/text/sdatabase/dabawiz02spreadsheet \
+helpcontent2/source/text/sdatabase/dabawiz02text \
 helpcontent2/source/text/sdatabase/dabawiz03auth \
 ))
 
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index ef2c1eb44..0158fc6d2 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -868,16 +868,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 ))
 
 $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
-helpcontent2/source/text/shared/explorer/database/dabawiz02 \
-helpcontent2/source/text/shared/explorer/database/dabawiz02access \
-helpcontent2/source/text/shared/explorer/database/dabawiz02ado \
-helpcontent2/source/text/shared/explorer/database/dabawiz02dbase \
-helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc \
-helpcontent2/source/text/shared/explorer/database/dabawiz02mysql \
-helpcontent2/source/text/shared/explorer/database/dabawiz02odbc \
-helpcontent2/source/text/shared/explorer/database/dabawiz02oracle \
-helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet \
-helpcontent2/source/text/shared/explorer/database/dabawiz02text \
 helpcontent2/source/text/shared/explorer/database/menubar \
 helpcontent2/source/text/shared/explorer/database/menuedit \
 helpcontent2/source/text/shared/explorer/database/menufile \
diff --git a/source/text/sdatabase/dabawiz00.xhp 
b/source/text/sdatabase/dabawiz00.xhp
index bbb1492b7..3451a0b5a 100644
--- a/source/text/sdatabase/dabawiz00.xhp
+++ b/source/text/sdatabase/dabawiz00.xhp
@@ -47,21 +47,21 @@
 Depending on 
the type of operation and the type of database, the Database Wizard consists of 
a varying number of steps.
 If you create a 
new database file, the wizard contains two steps.
 
-
+
 If you open the 
Database Wizard to create a database file for an existing database connection, 
there may be more steps to specify paths, authentication information, and 
more.
-Set up text file 
connection
+Set up text file 
connection
 
 
-Set up Microsoft 
Access connection
-Set up ADO 
connection
+Set up Microsoft Access 
connection
+Set up ADO connection
 
 
-Set up dBASE 
connection
-Set up JDBC 
connection
-Set up Oracle database 
connection
-
-ODBC 
settings
-Set up 
Spreadsheet connection
+Set up dBASE 
connection
+Set up JDBC 
connection
+Set up Oracle database 
connection
+
+ODBC settings
+Set up Spreadsheet 
connection
 
 
 
diff --git a/source/text/sdatabase/dabawiz01.xhp 
b/source/text/sdatabase/dabawiz01.xhp
index a6e22814a..5826a0d79 100644
--- a/source/text/sdatabase/dabawiz01.xhp
+++ b/source/text/sdatabase/dabawiz01.xhp
@@ -57,15 +57,15 @@
 Select the database type for the existing database 

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

2021-10-02 Thread Olivier Hallot (via logerrit)
 AllLangHelp_sdatabase.mk  |3 
 AllLangHelp_shared.mk |3 
 source/text/sdatabase/dabawiz00.xhp   |   21 --
 source/text/sdatabase/dabawiz01.xhp   |4 
 source/text/sdatabase/dabawiz03auth.xhp   |   16 -
 source/text/sdatabase/main.xhp|   17 --
 source/text/shared/01/0101.xhp|   82 +-
 source/text/shared/explorer/database/dabawiz02.xhp|   19 --
 source/text/shared/explorer/database/dabawiz02access.xhp  |   17 --
 source/text/shared/explorer/database/dabawiz02ado.xhp |   24 +-
 source/text/shared/explorer/database/dabawiz02dbase.xhp   |   16 -
 source/text/shared/explorer/database/dabawiz02jdbc.xhp|   31 +--
 source/text/shared/explorer/database/dabawiz02mysql.xhp   |4 
 source/text/shared/explorer/database/dabawiz02odbc.xhp|   20 --
 source/text/shared/explorer/database/dabawiz02oracle.xhp  |   21 +-
 source/text/shared/explorer/database/dabawiz02spreadsheet.xhp |   16 -
 source/text/shared/explorer/database/dabawiz02text.xhp|   25 +--
 source/text/shared/guide/data_im_export.xhp   |   25 +--
 source/text/shared/guide/data_new.xhp |9 -
 19 files changed, 161 insertions(+), 212 deletions(-)

New commits:
commit 6ad6a7c10c2684a5fbdac4bea643a215c3bcb8ab
Author: Olivier Hallot 
AuthorDate: Sat Oct 2 13:50:24 2021 -0300
Commit: Olivier Hallot 
CommitDate: Sat Oct 2 18:54:24 2021 +0200

Refactor database wizard help pages (part)

Change-Id: Ifcd63a48ca5faa3fa55f19f29494bd4ccaf3
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/123002
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index 23346f8c9..e0c62d192 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -53,6 +53,9 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
 helpcontent2/source/text/sdatabase/dabapropadd \
 helpcontent2/source/text/sdatabase/dabapropcon \
 helpcontent2/source/text/sdatabase/dabapropgen \
+helpcontent2/source/text/sdatabase/dabawiz00 \
+helpcontent2/source/text/sdatabase/dabawiz01 \
+helpcontent2/source/text/sdatabase/dabawiz03auth \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 48266a686..ef2c1eb44 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -868,8 +868,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 ))
 
 $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
-helpcontent2/source/text/shared/explorer/database/dabawiz00 \
-helpcontent2/source/text/shared/explorer/database/dabawiz01 \
 helpcontent2/source/text/shared/explorer/database/dabawiz02 \
 helpcontent2/source/text/shared/explorer/database/dabawiz02access \
 helpcontent2/source/text/shared/explorer/database/dabawiz02ado \
@@ -880,7 +878,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/explorer/database/dabawiz02oracle \
 helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet \
 helpcontent2/source/text/shared/explorer/database/dabawiz02text \
-helpcontent2/source/text/shared/explorer/database/dabawiz03auth \
 helpcontent2/source/text/shared/explorer/database/menubar \
 helpcontent2/source/text/shared/explorer/database/menuedit \
 helpcontent2/source/text/shared/explorer/database/menufile \
diff --git a/source/text/shared/explorer/database/dabawiz00.xhp 
b/source/text/sdatabase/dabawiz00.xhp
similarity index 84%
rename from source/text/shared/explorer/database/dabawiz00.xhp
rename to source/text/sdatabase/dabawiz00.xhp
index bb1cb6d64..bbb1492b7 100644
--- a/source/text/shared/explorer/database/dabawiz00.xhp
+++ b/source/text/sdatabase/dabawiz00.xhp
@@ -23,37 +23,32 @@
 
 
 Database Wizard
-/text/shared/explorer/database/dabawiz00.xhp
+/text/sdatabase/dabawiz00.xhp
 
 
 
 
-wizards;databases (Base)
+
+wizards;databases (Base)
 Database Wizard (Base)
 databases; formats (Base)
 MySQL databases (Base)
 MariaDB databases (Base)
 dBASE; database settings (Base)
+jdbc; database settings (Base)
+odbc; database settings (Base)
 spreadsheets;as databases (base)
 mw added "(Base)" to all entries
 
-Database Wizard
-The Database Wizard creates a database file that contains 
information about a database.UFI: extended help text must no 
longer contain switches or links
+
+Database Wizard
 The Database 
Wizard creates a database file 
that contains information about a database.
 
 Depending on 
the type of operation and the type of database, the Database Wizard consists of 
a varying number of steps.
-
-
 If you create a 
new database file, the wizard contains two steps.
-
-
-
+
 
-
-
 If you open the 
Database Wizard to creat

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

2021-07-17 Thread Olivier Hallot (via logerrit)
 AllLangHelp_sdatabase.mk  |5 +
 AllLangHelp_shared.mk |5 -
 source/text/sdatabase/dabadoc.xhp |   12 ++--
 source/text/sdatabase/dabaprop.xhp|   11 +--
 source/text/sdatabase/dabapropadd.xhp |   51 --
 source/text/sdatabase/dabapropcon.xhp |   13 +---
 source/text/sdatabase/dabapropgen.xhp |   47 +++-
 source/text/shared/01/0101.xhp|2 
 source/text/shared/explorer/database/dabawiz00.xhp|2 
 source/text/shared/explorer/database/menufilesave.xhp |2 
 source/text/shared/guide/data_register.xhp|2 
 source/text/shared/guide/data_view.xhp|2 
 12 files changed, 69 insertions(+), 85 deletions(-)

New commits:
commit 2271ad00c7e0312071b78706da40a778171bfb9a
Author: Olivier Hallot 
AuthorDate: Fri Jul 16 18:14:55 2021 -0300
Commit: Olivier Hallot 
CommitDate: Sat Jul 17 14:42:53 2021 +0200

Refactor database files

Change-Id: I10909197c08cec40819658d2d0951800133409da
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/119099
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index 337313b72..23346f8c9 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 ef4b88e0b..107c8b1a5 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/shared/explorer/database/dabadoc.xhp 
b/source/text/sdatabase/dabadoc.xhp
similarity index 85%
rename from source/text/shared/explorer/database/dabadoc.xhp
rename to source/text/sdatabase/dabadoc.xhp
index d3d785f4a..4ed6c6b95 100644
--- a/source/text/shared/explorer/database/dabadoc.xhp
+++ b/source/text/sdatabase/dabadoc.xhp
@@ -1,6 +1,6 @@
 
 
-   
+
 
- 
-   
+
+
 
   
  Database File
- /text/shared/explorer/database/dabadoc.xhp
+ /text/sdatabase/dabadoc.xhp
   


   
- Database 
File
+ Database File
  The database file window organizes the tables, views, queries, and 
reports of a database in %PRODUCTNAME.
   
   
  Working with databases in 
%PRODUCTNAME
   

-
\ No newline at end of file
+
diff --git a/source/text/shared/explorer/database/dabaprop.xhp 
b/source/text/sdatabase/dabaprop.xhp
similarity index 80%
rename from source/text/shared/explorer/database/dabaprop.xhp
rename to source/text/sdatabase/dabaprop.xhp
index 6e85496cc..8539d3008 100644
--- a/source/text/shared/explorer/database/dabaprop.xhp
+++ b/source/text/sdatabase/dabaprop.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-   
 
 
 
 Database Properties
-/text/shared/explorer/database/dabaprop.xhp
+/text/sdatabase/dabaprop.xhp
 
 
 UFI: Database Properties dialog
@@ -31,14 +28,14 @@
 
 
 
-Database 
Properties
+Database 
Properties
 Specifies the properties of a database.
 
 
 In a database 
window, choose Edit - Database - Properties
 
 
-
-
+
+
 
 
diff --git a/source/text/shared/explorer/database/dabapropadd.xhp 
b/source/text/sdatabase/dabapropadd.xhp
similarity index 66%
rename from source/text/shared/explorer/database/dabapropadd.xhp
rename to source/text/sdatabase/dabapropadd.xhp
index 1c603813d..677f14a7b 100644
--- a/source/text/shared/explorer/database/dabapropadd.xhp
+++ b/source/text/sdatabase/dabapropadd.xhp
@@ -1,7 +1,4 @@
 
-
-
-
 
-
-
-   
+
 
 
 Additional Settings
-/text/shared/explorer/database/dabapropadd.xhp
+/text/sdatabase/dabapropadd.xhp
 
 
 
 
-Additional 
Settings
+Additional 
Settings
 Specifies additional options for a data source.
 
 
 In a database 

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

2021-06-09 Thread Olivier Hallot (via logerrit)
 AllLangHelp_sdatabase.mk |3 +++
 AllLangHelp_shared.mk|3 ---
 source/text/sdatabase/dabaadvprop.xhp|   11 ---
 source/text/sdatabase/dabaadvpropdat.xhp |   15 +--
 source/text/sdatabase/dabaadvpropgen.xhp |   19 +++
 5 files changed, 31 insertions(+), 20 deletions(-)

New commits:
commit ed18f8e4f9fc516d1a9e117e983cdc8006838ad1
Author: Olivier Hallot 
AuthorDate: Tue Jun 8 09:14:19 2021 -0300
Commit: Olivier Hallot 
CommitDate: Wed Jun 9 15:16:54 2021 +0200

Refactor some database help files

Change-Id: Ia9f3e2844cdf4ac16d7ee3ba70d64415c2bf964d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/116837
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index b2723e0c4..337313b72 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -45,6 +45,9 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
 helpcontent2/source/text/sdatabase/11030100 \
 helpcontent2/source/text/sdatabase/1108 \
 helpcontent2/source/text/sdatabase/1109 \
+helpcontent2/source/text/sdatabase/dabaadvpropdat \
+helpcontent2/source/text/sdatabase/dabaadvpropgen \
+helpcontent2/source/text/sdatabase/dabaadvprop \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 65feeac78..6ebe3e7db 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -861,9 +861,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 ))
 
 $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
-helpcontent2/source/text/shared/explorer/database/dabaadvprop \
-helpcontent2/source/text/shared/explorer/database/dabaadvpropdat \
-helpcontent2/source/text/shared/explorer/database/dabaadvpropgen \
 helpcontent2/source/text/shared/explorer/database/dabadoc \
 helpcontent2/source/text/shared/explorer/database/dabaprop \
 helpcontent2/source/text/shared/explorer/database/dabapropadd \
diff --git a/source/text/shared/explorer/database/dabaadvprop.xhp 
b/source/text/sdatabase/dabaadvprop.xhp
similarity index 80%
rename from source/text/shared/explorer/database/dabaadvprop.xhp
rename to source/text/sdatabase/dabaadvprop.xhp
index ee8535766..fc008f5d5 100644
--- a/source/text/shared/explorer/database/dabaadvprop.xhp
+++ b/source/text/sdatabase/dabaadvprop.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-   
 
 
 
 Advanced Properties
-/text/shared/explorer/database/dabaadvprop.xhp
+/text/sdatabase/dabaadvprop.xhp
 
 
 Database advanced properties 
dialog
@@ -31,13 +28,13 @@
 
 
 
-Advanced 
Properties
+Advanced 
Properties
 Specifies 
advanced properties for the database.
 
 
 In a database 
window, choose Edit - Database - Properties, click Advanced 
Properties tab
 
-
-
+
+
 
 
diff --git a/source/text/shared/explorer/database/dabaadvpropdat.xhp 
b/source/text/sdatabase/dabaadvpropdat.xhp
similarity index 91%
rename from source/text/shared/explorer/database/dabaadvpropdat.xhp
rename to source/text/sdatabase/dabaadvpropdat.xhp
index 399a8693d..0a0e98f94 100644
--- a/source/text/shared/explorer/database/dabaadvpropdat.xhp
+++ b/source/text/sdatabase/dabaadvpropdat.xhp
@@ -21,14 +21,25 @@
 
   
  Special Settings
- /text/shared/explorer/database/dabaadvpropdat.xhp
+ /text/sdatabase/dabaadvpropdat.xhp
   


  
  
+ 
+ database;special settings
+ database settings;SQL92 naming
+ database settings;keyword AS
+ database settings;outer join syntax
+ database settings;special SELECT 
statements
+ database settings;ODBC date/time
+ database settings;support primary 
keys
+ database settings;line ends
+ database settings;version columns
+ 
   
- Special 
Settings
+ Special Settings
  Specifies the way you can work with data in a 
database.
   
   
diff --git a/source/text/shared/explorer/database/dabaadvpropgen.xhp 
b/source/text/sdatabase/dabaadvpropgen.xhp
similarity index 81%
rename from source/text/shared/explorer/database/dabaadvpropgen.xhp
rename to source/text/sdatabase/dabaadvpropgen.xhp
index 8627519bc..d9312dc5e 100644
--- a/source/text/shared/explorer/database/dabaadvpropgen.xhp
+++ b/source/text/sdatabase/dabaadvpropgen.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-   
 
 
 
 Generated Values
-/text/shared/explorer/database/dabaadvpropgen.xhp
+/text/sdatabase/dabaadvpropgen.xhp
 
 
 Advanced Properties dialog Generated 
values tab page
 
 
 
+
+database advanced properties;autoincrement 
values
+database advanced properties;automatic generated 
values
+database advanced properties;retrieve generated 
values
+database advanced properties;query generated 
values
+
 
-Generated 
Values
+Generated 
Values
 Specifies the 
options for automatically generated values for new data records.UFI: 
all text copied from shared\explore

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

2021-05-03 Thread Olivier Hallot (via logerrit)
 AllLangHelp_sdatabase.mk   |6 ++
 AllLangHelp_shared.mk  |6 --
 source/text/sdatabase/1102.xhp |   11 ---
 source/text/sdatabase/1102.xhp |   31 +--
 source/text/sdatabase/1103.xhp |   20 ++--
 source/text/sdatabase/11030100.xhp |   25 ++---
 source/text/sdatabase/1108.xhp |   21 -
 source/text/sdatabase/1109.xhp |   13 -
 source/text/shared/02/1201.xhp |2 +-
 9 files changed, 56 insertions(+), 79 deletions(-)

New commits:
commit f8bb58500148b126c2730977d566e7fa315439b0
Author: Olivier Hallot 
AuthorDate: Sun May 2 08:49:46 2021 -0300
Commit: Olivier Hallot 
CommitDate: Mon May 3 15:58:58 2021 +0200

Refactor more database help files

Change-Id: I1384c2d3d0090ce15fc5088bff4bfdb07fa7cdbf
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/114995
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index a1899d7fd..b2723e0c4 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -39,6 +39,12 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
 helpcontent2/source/text/sdatabase/05040100 \
 helpcontent2/source/text/sdatabase/05040200 \
 helpcontent2/source/text/sdatabase/toolbars \
+helpcontent2/source/text/sdatabase/1102 \
+helpcontent2/source/text/sdatabase/1102 \
+helpcontent2/source/text/sdatabase/1103 \
+helpcontent2/source/text/sdatabase/11030100 \
+helpcontent2/source/text/sdatabase/1108 \
+helpcontent2/source/text/sdatabase/1109 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 5ffdc9d92..65feeac78 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -861,12 +861,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 ))
 
 $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
-helpcontent2/source/text/shared/explorer/database/1102 \
-helpcontent2/source/text/shared/explorer/database/1102 \
-helpcontent2/source/text/shared/explorer/database/1103 \
-helpcontent2/source/text/shared/explorer/database/11030100 \
-helpcontent2/source/text/shared/explorer/database/1108 \
-helpcontent2/source/text/shared/explorer/database/1109 \
 helpcontent2/source/text/shared/explorer/database/dabaadvprop \
 helpcontent2/source/text/shared/explorer/database/dabaadvpropdat \
 helpcontent2/source/text/shared/explorer/database/dabaadvpropgen \
diff --git a/source/text/shared/explorer/database/1102.xhp 
b/source/text/sdatabase/1102.xhp
similarity index 84%
rename from source/text/shared/explorer/database/1102.xhp
rename to source/text/sdatabase/1102.xhp
index c5e91dd6c..43107a4a2 100644
--- a/source/text/shared/explorer/database/1102.xhp
+++ b/source/text/sdatabase/1102.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-
 
 
 
 Data sources in $[officename]
-/text/shared/explorer/database/1102.xhp
+/text/sdatabase/05040200.xhp
 
 
 Sun Microsystems, Inc.
@@ -32,13 +29,13 @@
 
 databases;drag and drop 
(Base)
 mw added "(Base)"
-Data sources in $[officename]
+Data sources in $[officename]
 
-Selecting the Address Book
+Selecting the Address Book
 
 To select the 
address book that you want to use, choose Tools - Address Book Source.
 
-Opening 
a Data Source
+Opening a Data Source
 
 
 To open the 
data source view, press CommandCtrl+Shift+F4
 in a text, spreadsheet or form document.
diff --git a/source/text/shared/explorer/database/1102.xhp 
b/source/text/sdatabase/1102.xhp
similarity index 76%
rename from source/text/shared/explorer/database/1102.xhp
rename to source/text/sdatabase/1102.xhp
index 642783c67..8e1f9484b 100644
--- a/source/text/shared/explorer/database/1102.xhp
+++ b/source/text/sdatabase/1102.xhp
@@ -1,7 +1,4 @@
 
-
-
-
 
-
-
-   
+
 
 
 ODBC
-/text/shared/explorer/database/1102.xhp
+/text/sdatabase/1102.xhp
 
 
 
 
-ODBCstill some Help IDs in this file. Else it can 
be removed
+ODBCstill some Help IDs in this file. Else it can 
be removed
 Specifies the settings for ODBC databases. This 
includes your user access data, driver settings, and font 
definitions.
 
 
-User 
Name
+User Name
 Type the user name for accessing the database.
 
 
-Password required
+Password required
 Prevents an unauthorized user from accessing the database. You only 
need to enter the password once per session.
 
 
-Driver Settings
+Driver Settings
 Use this text field to enter additional 
optional driver settings if this is necessary.
 
 
-Character Set
+Character 
Set
 Select the code conversion that you want to use 
to view the database in $[officename]. This does not affect the 
database. Choose "System" to use the default character set of your 
operating system. Text and dBASE databases are restricted to character sets 
with a 

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

2021-04-14 Thread Olivier Hallot (via logerrit)
 AllLangHelp_sdatabase.mk   |3 +++
 AllLangHelp_shared.mk  |3 ---
 source/text/sdatabase/0504.xhp |   13 -
 source/text/sdatabase/05040100.xhp |   27 ---
 source/text/sdatabase/05040200.xhp |   11 +++
 5 files changed, 22 insertions(+), 35 deletions(-)

New commits:
commit 5ba538ce7121b2733824ff71f0e553d004429247
Author: Olivier Hallot 
AuthorDate: Wed Apr 14 08:59:19 2021 -0300
Commit: Olivier Hallot 
CommitDate: Wed Apr 14 14:24:08 2021 +0200

Refactor somedatabase Help files

put in th right folder

Change-Id: I4e396ce184abc6cc7f9d51fc283a8cba62fd9c82
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/114087
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index b9cd52e67..a1899d7fd 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -35,6 +35,9 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
 helpcontent2/source/text/sdatabase/05030200 \
 helpcontent2/source/text/sdatabase/05030300 \
 helpcontent2/source/text/sdatabase/05030400 \
+helpcontent2/source/text/sdatabase/0504 \
+helpcontent2/source/text/sdatabase/05040100 \
+helpcontent2/source/text/sdatabase/05040200 \
 helpcontent2/source/text/sdatabase/toolbars \
 ))
 
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 97c1a0a16..5ffdc9d92 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -861,9 +861,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 ))
 
 $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
-helpcontent2/source/text/shared/explorer/database/0504 \
-helpcontent2/source/text/shared/explorer/database/05040100 \
-helpcontent2/source/text/shared/explorer/database/05040200 \
 helpcontent2/source/text/shared/explorer/database/1102 \
 helpcontent2/source/text/shared/explorer/database/1102 \
 helpcontent2/source/text/shared/explorer/database/1103 \
diff --git a/source/text/shared/explorer/database/0504.xhp 
b/source/text/sdatabase/0504.xhp
similarity index 75%
rename from source/text/shared/explorer/database/0504.xhp
rename to source/text/sdatabase/0504.xhp
index 980095ca9..c3f068e0b 100644
--- a/source/text/shared/explorer/database/0504.xhp
+++ b/source/text/sdatabase/0504.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-
-
-   
 
 
 
 General
-/text/shared/explorer/database/0504.xhp
+/text/sdatabase/0504.xhp
 
 
 Sun Microsystems, Inc.
 
 
 
-General
-
-
+General
+
+
 
 
diff --git a/source/text/shared/explorer/database/05040100.xhp 
b/source/text/sdatabase/05040100.xhp
similarity index 73%
rename from source/text/shared/explorer/database/05040100.xhp
rename to source/text/sdatabase/05040100.xhp
index 9c45e34f1..538820245 100644
--- a/source/text/shared/explorer/database/05040100.xhp
+++ b/source/text/sdatabase/05040100.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-   
 
 
 
 General
-/text/shared/explorer/database/05040100.xhp
+/text/sdatabase/05040100.xhp
 
 
 Sun Microsystems, Inc.
@@ -31,32 +28,32 @@
 
 
 
-General
+General
 When you 
create a database table as an administrator, you can use this tab to determine 
user access, and to edit the data or the table structure.
 
 access rights for database tables 
(Base)
 tables in databases; access rights to (Base)
 mw added "(Base)" to all entries
 If you are not 
the administrator, you can use the General tab to view your access 
rights for the selected table.
-Table 
name
+Table name
 Displays the 
name of the selected database table.
-Type
+Type
 Displays the 
type of database.
-Location
+Location
 Displays the 
complete path of the database table.
-Read 
data
+Read data
 Allows a user to read the data.
-Insert 
data
+Insert data
 Allows a user to insert new data.
-Change 
data
+Change data
 Allows a user to change data.
-Delete 
data
+Delete data
 Allows a user to delete data.
-Change 
table structure
+Change table structure
 Allows a user to change the table structure.
-Definition
+Definition
 Allows the user to delete the table structure.
-Modify 
references
+Modify references
 Allows the user to modify the defined references, for example, to enter 
new relations for the table or to delete existing relations.
 
 
diff --git a/source/text/shared/explorer/database/05040200.xhp 
b/source/text/sdatabase/05040200.xhp
similarity index 79%
rename from source/text/shared/explorer/database/05040200.xhp
rename to source/text/sdatabase/05040200.xhp
index 37db839f3..dfb61ef7b 100644
--- a/source/text/shared/explorer/database/05040200.xhp
+++ b/source/text/sdatabase/05040200.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-
-
-   
 
 
 
 Description
-/text/shared/explorer/database/05040200.xhp
+/text/sdatabase/05040200.xhp
 
 
 Sun Microsystems, Inc.
@@ -33,9 +28,9 @@
 
 
 
-Description
+Description
 
-Table 
description
+Table description
 Displays the description for the selected table.
 
 
___

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

2021-03-23 Thread Olivier Hallot (via logerrit)
 AllLangHelp_sdatabase.mk   |5 +
 AllLangHelp_shared.mk  |5 -
 source/text/sdatabase/0503.xhp |   13 +
 source/text/sdatabase/05030100.xhp |   33 ++---
 source/text/sdatabase/05030200.xhp |   21 -
 source/text/sdatabase/05030300.xhp |   29 -
 source/text/sdatabase/05030400.xhp |   21 -
 7 files changed, 52 insertions(+), 75 deletions(-)

New commits:
commit ab806360c69c9f59c7782535d4e8a95bd939276e
Author: Olivier Hallot 
AuthorDate: Mon Mar 22 17:22:56 2021 -0300
Commit: Olivier Hallot 
CommitDate: Tue Mar 23 16:51:42 2021 +0100

Refatctor database help files

put them in /sdatabase/

Change-Id: I80bcd63dacf36f36e189dfe93e6a4f7ab5d865e5
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112940
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index f6a005f86..b9cd52e67 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -30,6 +30,11 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
 helpcontent2/source/text/sdatabase/05010100 \
 helpcontent2/source/text/sdatabase/0502 \
 helpcontent2/source/text/sdatabase/05020100 \
+helpcontent2/source/text/sdatabase/0503 \
+helpcontent2/source/text/sdatabase/05030100 \
+helpcontent2/source/text/sdatabase/05030200 \
+helpcontent2/source/text/sdatabase/05030300 \
+helpcontent2/source/text/sdatabase/05030400 \
 helpcontent2/source/text/sdatabase/toolbars \
 ))
 
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index d81d87cd5..97c1a0a16 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -861,11 +861,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 ))
 
 $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
-helpcontent2/source/text/shared/explorer/database/0503 \
-helpcontent2/source/text/shared/explorer/database/05030100 \
-helpcontent2/source/text/shared/explorer/database/05030200 \
-helpcontent2/source/text/shared/explorer/database/05030300 \
-helpcontent2/source/text/shared/explorer/database/05030400 \
 helpcontent2/source/text/shared/explorer/database/0504 \
 helpcontent2/source/text/shared/explorer/database/05040100 \
 helpcontent2/source/text/shared/explorer/database/05040200 \
diff --git a/source/text/shared/explorer/database/0503.xhp 
b/source/text/sdatabase/0503.xhp
similarity index 84%
rename from source/text/shared/explorer/database/0503.xhp
rename to source/text/sdatabase/0503.xhp
index 8f6da339c..ca3b9a188 100644
--- a/source/text/shared/explorer/database/0503.xhp
+++ b/source/text/sdatabase/0503.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-   
 
 
 
 Copy a Table by Drag-and-Drop
-/text/shared/explorer/database/0503.xhp
+/text/sdatabase/0503.xhp
 
 
 Sun Microsystems, Inc.
 
 
 
-Copy Query or Table by Drag-and-Drop
+Copy Query or Table by 
Drag-and-Drop
 queries; copying (Base)
 tables in databases; copying database tables 
(Base)
 mw deleted "database tables;"
@@ -48,8 +45,8 @@
 
 
 You can copy 
within the same database or between different databases.
-
-
-
+
+
+
 
 
diff --git a/source/text/shared/explorer/database/05030100.xhp 
b/source/text/sdatabase/05030100.xhp
similarity index 71%
rename from source/text/shared/explorer/database/05030100.xhp
rename to source/text/sdatabase/05030100.xhp
index 23d5f08b2..7151193e6 100644
--- a/source/text/shared/explorer/database/05030100.xhp
+++ b/source/text/sdatabase/05030100.xhp
@@ -1,7 +1,4 @@
 
-
-
-
 
-
-
-   
+
 
 
 Copy Table
-/text/shared/explorer/database/05030100.xhp
+/text/sdatabase/05030100.xhp
 
 
 
 
 
-Copy 
Table
+Copy Table
 You can copy a 
table by dragging and dropping the table onto the table area of a database file 
window. The Copy table dialog appears.
 
-Table name
+Table name
 Specifies a name for the copy. 
Some databases only accept names containing eight or fewer 
characters.
-Options
-Definition and data
+Options
+Definition and 
data
 Creates a 1:1 copy of the database 
table. The table definition and the complete data are copied. The table 
definition includes the table structure and format from different data fields, 
including special field properties. The field contents supply the 
data.
-Definition
+Definition
 Copies only the table definition and not 
the corresponding data.
-As table view
+As table view
 If the database supports Views and you 
selected this option, a query will be created in the table container as a 
table. This option allows you to view the query results as a normal table 
view. The table will be filtered in the view with a "Select" SQL 
statement.
-Append datasee #i63815
+Append 
datasee #i63815
 Appends the data of the table to be copied 
to an existing table.
 The table 
definition must be exactly the same so that data can be copied. Data

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

2021-02-27 Thread Olivier Hallot (via logerrit)
 AllLangHelp_sdatabase.mk   |2 +
 AllLangHelp_shared.mk  |2 -
 source/text/sdatabase/0500.xhp |2 -
 source/text/sdatabase/0501.xhp |2 -
 source/text/sdatabase/0502.xhp |   22 ++--
 source/text/sdatabase/05020100.xhp |   36 +
 source/text/shared/explorer/database/menutools.xhp |2 -
 source/text/shared/guide/database_main.xhp |2 -
 8 files changed, 33 insertions(+), 37 deletions(-)

New commits:
commit 6c9b69b325847e9211679bcfee453ab25612feee
Author: Olivier Hallot 
AuthorDate: Sat Feb 27 11:56:08 2021 -0300
Commit: Olivier Hallot 
CommitDate: Sat Feb 27 15:59:30 2021 +0100

Refactor relations Help pages in sdatabase/

Change-Id: I6bb25934bc3f1443fbd5aa9806936a3628c03454
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/111681
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index b40a21138..f6a005f86 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -28,6 +28,8 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
 helpcontent2/source/text/sdatabase/0503 \
 helpcontent2/source/text/sdatabase/0501 \
 helpcontent2/source/text/sdatabase/05010100 \
+helpcontent2/source/text/sdatabase/0502 \
+helpcontent2/source/text/sdatabase/05020100 \
 helpcontent2/source/text/sdatabase/toolbars \
 ))
 
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index f29c946fd..d72432549 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -861,8 +861,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 ))
 
 $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
-helpcontent2/source/text/shared/explorer/database/0502 \
-helpcontent2/source/text/shared/explorer/database/05020100 \
 helpcontent2/source/text/shared/explorer/database/0503 \
 helpcontent2/source/text/shared/explorer/database/05030100 \
 helpcontent2/source/text/shared/explorer/database/05030200 \
diff --git a/source/text/sdatabase/0500.xhp 
b/source/text/sdatabase/0500.xhp
index a68f9ee4b..d42d38553 100644
--- a/source/text/sdatabase/0500.xhp
+++ b/source/text/sdatabase/0500.xhp
@@ -36,7 +36,7 @@
 
 
 Sort and Filter Data
-Relations, Primary and External 
Key
+Relations, Primary and External 
Key
 
 
 
diff --git a/source/text/sdatabase/0501.xhp 
b/source/text/sdatabase/0501.xhp
index 6855b5815..130e25358 100644
--- a/source/text/sdatabase/0501.xhp
+++ b/source/text/sdatabase/0501.xhp
@@ -38,7 +38,7 @@
 Depending on 
the database system used, you will find the following entries on the context 
menus:
 
 If a table is open, 
there are several functions available to edit the data.
-
+
 
 
 
diff --git a/source/text/shared/explorer/database/0502.xhp 
b/source/text/sdatabase/0502.xhp
similarity index 78%
rename from source/text/shared/explorer/database/0502.xhp
rename to source/text/sdatabase/0502.xhp
index 6c2da878f..d510070b0 100644
--- a/source/text/shared/explorer/database/0502.xhp
+++ b/source/text/sdatabase/0502.xhp
@@ -1,6 +1,6 @@
 
 
-   
+
 
- 
-   
+
+
 
 
 Relations
-/text/shared/explorer/database/0502.xhp
+/text/sdatabase/0502.xhp
 
 
 
 
 
-Relations
+Relations
 relational databases (Base)
 mw added "(Base)"
 This command 
opens the Relation Design window, which allows you to define 
relationships between various database tables.
@@ -38,26 +38,26 @@
 
 
 
-This function is 
only available if you are working with a relational database.
+This function is only available if you are working 
with a relational database.
 When you 
choose Tools - Relationships, a window opens in which all the 
existing relationships between the tables of the current database are shown. If 
no relationships have been defined, or if you want to relate other tables of 
the database to each other, then click on the Add Tables icon. The 
Add Tables 
dialog opens in which you can select the tables with which to create a 
relation.
 
-If the 
Relation Design window is open, the selected tables cannot be 
modified, even in Table Design mode. This ensures that tables are not changed 
while the relations are being created.
+If the Relation Design window is open, 
the selected tables cannot be modified, even in Table Design mode. This ensures 
that tables are not changed while the relations are being created.
 The selected 
tables are shown in the top area of the relation design view. You can close a 
table window through the context menu or with the Delete key.
 
 primary keys;inserting (Base)
 keys;primary keys (Base)
 external keys (Base)
 mw added "(Base)" to all entries
-Primary 
key and foreign keys
+Primary key and foreign keys
 If you want to 
define a relation among the various tables, you should enter a primary 
key that u

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

2021-01-11 Thread Olivier Hallot (via logerrit)
 AllLangHelp_sdatabase.mk   |3 +
 AllLangHelp_shared.mk  |3 -
 source/text/sdatabase/0500.xhp |   19 ++-
 source/text/sdatabase/0501.xhp |   11 +---
 source/text/sdatabase/0503.xhp |   15 ++---
 source/text/shared/01/05340400.xhp |   97 +
 6 files changed, 65 insertions(+), 83 deletions(-)

New commits:
commit 0703d0cacd74d084009d7f8436fa833c77b56c1f
Author: Olivier Hallot 
AuthorDate: Mon Jan 11 10:27:00 2021 -0300
Commit: Olivier Hallot 
CommitDate: Mon Jan 11 14:38:44 2021 +0100

Refactor and fix links in database Help

Change-Id: Id6a6eabd496ca6c49979e6766081d78274217c4e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109096
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index 05c6b48a9..591591974 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -23,6 +23,9 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
 helpcontent2/source/text/sdatabase/02010101 \
 helpcontent2/source/text/sdatabase/0400 \
 helpcontent2/source/text/sdatabase/0403 \
+helpcontent2/source/text/sdatabase/0500 \
+helpcontent2/source/text/sdatabase/0501 \
+helpcontent2/source/text/sdatabase/0503 \
 helpcontent2/source/text/sdatabase/toolbars \
 ))
 
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 7f9a70752..5cf886e06 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -861,9 +861,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 ))
 
 $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
-helpcontent2/source/text/shared/explorer/database/0500 \
-helpcontent2/source/text/shared/explorer/database/0501 \
-helpcontent2/source/text/shared/explorer/database/0503 \
 helpcontent2/source/text/shared/explorer/database/0501 \
 helpcontent2/source/text/shared/explorer/database/05010100 \
 helpcontent2/source/text/shared/explorer/database/0502 \
diff --git a/source/text/shared/explorer/database/0500.xhp 
b/source/text/sdatabase/0500.xhp
similarity index 63%
rename from source/text/shared/explorer/database/0500.xhp
rename to source/text/sdatabase/0500.xhp
index 990465d2c..694dd0d92 100644
--- a/source/text/shared/explorer/database/0500.xhp
+++ b/source/text/sdatabase/0500.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-
-
-
 
 
 
 Tables
-/text/shared/explorer/database/0500.xhp
+/text/sdatabase/0500.xhp
 
 
 Sun Microsystems, Inc.
@@ -33,15 +28,15 @@
 
 
 
-Tables
+Tables
 Table data 
edit mode allows you to see your data as rows of records, with optional 
filtering and sorting of that data. In this mode, you can also enter new 
records, make changes to, and delete existing records.
 
 In the 
$[officename] Help, you will find further information on the following 
subjects:
-Create new or edit table design
+Create new or edit table 
design
 
-
-Sort and Filter 
Data
-Relations, Primary and External Key
-
+
+Sort and Filter Data
+Relations, Primary and External 
Key
+
 
 
diff --git a/source/text/shared/explorer/database/0501.xhp 
b/source/text/sdatabase/0501.xhp
similarity index 77%
rename from source/text/shared/explorer/database/0501.xhp
rename to source/text/sdatabase/0501.xhp
index 74cb32548..6855b5815 100644
--- a/source/text/shared/explorer/database/0501.xhp
+++ b/source/text/sdatabase/0501.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-
-
-
 
 
 
 Table Context Menus
-/text/shared/explorer/database/0501.xhp
+/text/sdatabase/0501.xhp
 
 
 Sun Microsystems, Inc.
@@ -33,13 +28,13 @@
 
 
 
-Table Context Menus
+Table Context Menus
 The context 
menu of the table container offers various functions that apply to all database 
tables. To edit a particular table within the database, select the 
corresponding table and open its context menu.
 
 
   
 
-Depending on the 
context, it is possible that not all the functions for your current database 
will be listed in the context menus. For example, the 
Relationships command for defining relationships between various 
tables is only available with relational databases.
+Depending on the context, it is possible that not all 
the functions for your current database will be listed in the context menus. 
For example, the Relationships command for defining relationships 
between various tables is only available with relational databases.
 Depending on 
the database system used, you will find the following entries on the context 
menus:
 
 If a table is open, 
there are several functions available to edit the data.
diff --git a/source/text/shared/explorer/database/0503.xhp 
b/source/text/sdatabase/0503.xhp
similarity index 82%
rename from source/text/shared/explorer/database/0503.xhp
rename to source/text/sdatabase/0503.xhp
index 56227495a..8d41b96c0 100644
--- a/source/text/shared/explorer/database/0503.xhp
+++ b/source/text/s

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

2020-10-27 Thread Olivier Hallot (via logerrit)
 AllLangHelp_sdatabase.mk   |2 ++
 AllLangHelp_shared.mk  |2 --
 source/text/sdatabase/0400.xhp |   18 +++---
 source/text/sdatabase/0403.xhp |   12 
 source/text/shared/02/01170500.xhp |2 +-
 source/text/shared/02/01171000.xhp |2 +-
 source/text/shared/guide/database_main.xhp |2 +-
 source/text/shared/main0213.xhp|2 +-
 8 files changed, 17 insertions(+), 25 deletions(-)

New commits:
commit c1b3e8ec874a7d3fa2463a17bd55452315cec6df
Author: Olivier Hallot 
AuthorDate: Tue Oct 27 08:26:29 2020 -0300
Commit: Olivier Hallot 
CommitDate: Tue Oct 27 13:13:00 2020 +0100

Refactor database Help pages

Move pages to proper Help module (WIP)

Change-Id: I15fce44e0f066439db88175d1fd3754f4b618e23
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104880
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index 45fff73e8..05c6b48a9 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -21,6 +21,8 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
 helpcontent2/source/text/sdatabase/0202 \
 helpcontent2/source/text/sdatabase/02010100 \
 helpcontent2/source/text/sdatabase/02010101 \
+helpcontent2/source/text/sdatabase/0400 \
+helpcontent2/source/text/sdatabase/0403 \
 helpcontent2/source/text/sdatabase/toolbars \
 ))
 
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index a55d39e6f..888d70baf 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -861,8 +861,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 ))
 
 $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
-helpcontent2/source/text/shared/explorer/database/0400 \
-helpcontent2/source/text/shared/explorer/database/0403 \
 helpcontent2/source/text/shared/explorer/database/0500 \
 helpcontent2/source/text/shared/explorer/database/0501 \
 helpcontent2/source/text/shared/explorer/database/0503 \
diff --git a/source/text/shared/explorer/database/0400.xhp 
b/source/text/sdatabase/0400.xhp
similarity index 67%
rename from source/text/shared/explorer/database/0400.xhp
rename to source/text/sdatabase/0400.xhp
index ba25e9281..454f308d5 100644
--- a/source/text/shared/explorer/database/0400.xhp
+++ b/source/text/sdatabase/0400.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-
-
 
 
 
 Forms
-/text/shared/explorer/database/0400.xhp
+/text/sdatabase/0400.xhp
 
 
 Sun Microsystems, Inc.
@@ -32,25 +28,25 @@
 
 
 
-Forms
+Forms
 forms; general information 
(Base)
 mw added "(Base)"
 Forms can be 
used to enter or to edit existing database contents easily.
 
-FormWizard
-Form 
Controls
+FormWizard
+Form Controls
 The Form 
Controls toolbar provides the tools required to create a form in a text, table, 
drawing, or presentation document.
-Form in Design Mode
+Form in Design Mode
 In design 
mode, the form is designed and the properties of the form and the controls 
contained in it are defined.
 
 
-Sorting and 
Filtering Data
+Sorting and Filtering Data
 You will find 
the sorting and filter functions in the toolbar when you open a form in user 
mode.
 
 
 
 
-Subforms
+Subforms
 
 
 
diff --git a/source/text/shared/explorer/database/0403.xhp 
b/source/text/sdatabase/0403.xhp
similarity index 91%
rename from source/text/shared/explorer/database/0403.xhp
rename to source/text/sdatabase/0403.xhp
index 2cbf9da84..dba9ddaff 100644
--- a/source/text/shared/explorer/database/0403.xhp
+++ b/source/text/sdatabase/0403.xhp
@@ -1,6 +1,4 @@
-
-
-
+
 
-
-
 
 
 
 Form Design
-/text/shared/explorer/database/0403.xhp
+/text/sdatabase/0403.xhp
 
 
 Sun Microsystems, Inc.
@@ -33,8 +29,8 @@
 
 forms; designing (Base)
 mw added "(Base)"
-Form 
Design
-
+Form Design
+
 Any 
$[officename] document can be expanded into a form. Simply add one or more form 
controls.
 Open the Form 
Controls toolbar. The Form Controls toolbar contains the functions needed to 
edit a form. More functions can be found in the Form Design bar 
and More Controls bar.
 In form design 
mode you can include controls, apply properties to them, define Form 
properties, and define subforms.
diff --git a/source/text/shared/02/01170500.xhp 
b/source/text/shared/02/01170500.xhp
index f31ae3aa0..23029402e 100644
--- a/source/text/shared/02/01170500.xhp
+++ b/source/text/shared/02/01170500.xhp
@@ -34,7 +34,7 @@
 
 
 Design Mode 
On/Off
-Toggles the Design mode on or off. This function is used to switch 
quickly between Design and User mode. Activate to edit the form controls, 
deactivate to use the form controls.
+Toggles the Design mode on or off. This function is used to switch 
quickly between Design and User mode. Activate to edit the form controls, 
deactivate to use the form controls.
 
 
   
diff --git a/source/text/share

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

2020-09-22 Thread Olivier Hallot (via logerrit)
 AllLangHelp_sdatabase.mk   |1 +
 AllLangHelp_shared.mk  |1 -
 source/text/sdatabase/02010100.xhp |2 +-
 source/text/sdatabase/02010101.xhp |   22 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit ab4b270d35eb6db2f0e2408f33e7817a9a0e7ce0
Author: Olivier Hallot 
AuthorDate: Tue Sep 22 21:23:11 2020 -0300
Commit: Olivier Hallot 
CommitDate: Wed Sep 23 02:26:36 2020 +0200

Refactor Relations Help page

Change-Id: Iaf32149f3a546c04bc13206213c748bc6be01b4c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/103222
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index bca681984..45fff73e8 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
 helpcontent2/source/text/sdatabase/0200 \
 helpcontent2/source/text/sdatabase/0202 \
 helpcontent2/source/text/sdatabase/02010100 \
+helpcontent2/source/text/sdatabase/02010101 \
 helpcontent2/source/text/sdatabase/toolbars \
 ))
 
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 1dfbd1d49..d587c0cae 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -860,7 +860,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 ))
 
 $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
-helpcontent2/source/text/shared/explorer/database/02010101 \
 helpcontent2/source/text/shared/explorer/database/0400 \
 helpcontent2/source/text/shared/explorer/database/0403 \
 helpcontent2/source/text/shared/explorer/database/0500 \
diff --git a/source/text/sdatabase/02010100.xhp 
b/source/text/sdatabase/02010100.xhp
index 44d31d74b..0e6cd9e99 100644
--- a/source/text/sdatabase/02010100.xhp
+++ b/source/text/sdatabase/02010100.xhp
@@ -127,7 +127,7 @@
 You cannot access tables from different databases in 
a query. Queries involving multiple tables can only be created within one 
database.
 
 Specifying the relation type
-If you 
double-click on the line connecting two linked fields or call the menu command 
Insert - New Relation, you can specify the type of relation in the 
Relations dialog.
+If you 
double-click on the line connecting two linked fields or call the menu command 
Insert - New Relation, you can specify the type of relation in the 
Relations dialog.
 
 Edit Join 
Properties. Alternatively, press Tab until the line is selected, then 
press Shift+F10 to display the context menu and there choose the command 
Edit. Some databases support only a subset of the possible join 
types.
 
diff --git a/source/text/shared/explorer/database/02010101.xhp 
b/source/text/sdatabase/02010101.xhp
similarity index 82%
rename from source/text/shared/explorer/database/02010101.xhp
rename to source/text/sdatabase/02010101.xhp
index f55468450..212c76f24 100644
--- a/source/text/shared/explorer/database/02010101.xhp
+++ b/source/text/sdatabase/02010101.xhp
@@ -23,7 +23,7 @@
 
   
  Join Properties
- /text/shared/explorer/database/02010101.xhp
+ /text/sdatabase/02010101.xhp
   


@@ -34,30 +34,30 @@
   right joins (Base)
   full joins (Base)
 mw deleted "join properties" and changed "link 
properties..." to "links;"
-Join 
Properties
+Join Properties
   If you 
double-click a connection between two linked fields in the query design, or if 
you choose Insert - New Relation, the Join Properties 
dialog appears. These properties will be used in all queries created in the 
future.
   
  
   
 
 
-Tables 
involved
+Tables involved
   Specifies two different tables that you 
want to join.
-  Fields involved
+  Fields involved
   Specifies two data fields that will be joined by a 
relation.
-  Options
+  Options
 
-Type
+Type
   Specifies the join type of the selected 
join. Some databases support only a subset of the various possible 
types.
-  Inner Join
+  Inner Join
   In an inner join, the results table contains 
only those records for which the content of the linked fields is the 
same. In $[officename] SQL this type of link is created by a 
corresponding WHERE clause.
-  Left Join
+  Left Join
   In a left join, the results table contains 
all records of the queried fields from the left table and only those records of 
the queried fields from the right table for which the content of the linked 
fields is the same. In $[officename] SQL this type of link corresponds 
to the LEFT OUTER JOIN command.
-  Right Join
+  Right Join
   In a right join, the results table contains 
all records of the queried fields from the right table and only those records 
of the queried fields from the left table for which the content of the linked 
fields is the same. In $[officename] SQL this type of link corresponds 
to the RIGHT OUTER JOIN command.
-  Fu

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

2020-08-12 Thread Olivier Hallot (via logerrit)
 AllLangHelp_sdatabase.mk  |1 
 AllLangHelp_shared.mk |1 
 source/text/sdatabase/0200.xhp|8 -
 source/text/sdatabase/0202.xhp|4 
 source/text/sdatabase/02010100.xhp|  100 +++---
 source/text/shared/02/01170203.xhp|2 
 source/text/shared/02/1403.xhp|2 
 source/text/shared/02/1404.xhp|2 
 source/text/shared/02/1405.xhp|2 
 source/text/shared/02/1406.xhp|2 
 source/text/shared/02/1407.xhp|2 
 source/text/shared/02/limit.xhp   |2 
 source/text/shared/explorer/database/0502.xhp |2 
 source/text/shared/explorer/database/1108.xhp |2 
 source/text/shared/guide/data_enter_sql.xhp   |2 
 source/text/shared/guide/data_queries.xhp |2 
 source/text/shared/guide/data_search2.xhp |2 
 source/text/shared/guide/data_tables.xhp  |2 
 18 files changed, 70 insertions(+), 70 deletions(-)

New commits:
commit 49af25239f655a8d87dbe28bf5ed75040ca6bc11
Author: Olivier Hallot 
AuthorDate: Wed Aug 12 17:15:17 2020 -0300
Commit: Olivier Hallot 
CommitDate: Wed Aug 12 22:32:17 2020 +0200

Reposition query design help page

Change-Id: I5bf19c20cbac1b764aec972fa756586438279cc0
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100629
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index 4065e5c30..bca681984 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
 helpcontent2/source/text/sdatabase/main \
 helpcontent2/source/text/sdatabase/0200 \
 helpcontent2/source/text/sdatabase/0202 \
+helpcontent2/source/text/sdatabase/02010100 \
 helpcontent2/source/text/sdatabase/toolbars \
 ))
 
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index b3e7f75f8..92c720da5 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -856,7 +856,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 ))
 
 $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
-helpcontent2/source/text/shared/explorer/database/02010100 \
 helpcontent2/source/text/shared/explorer/database/02010101 \
 helpcontent2/source/text/shared/explorer/database/0400 \
 helpcontent2/source/text/shared/explorer/database/0403 \
diff --git a/source/text/sdatabase/0200.xhp 
b/source/text/sdatabase/0200.xhp
index e3fa83b2e..265121e3b 100644
--- a/source/text/sdatabase/0200.xhp
+++ b/source/text/sdatabase/0200.xhp
@@ -59,14 +59,14 @@
 You can also open the data source view 
(Ctrl+Shift+F4), select the entire database table in the data source view 
(click on the top left corner of the table), and then drag the selection to a 
text document or spreadsheet.
 Sorting and Filtering Data
 Allows you to 
sort and filter the data in a query table.
-Query Design
+Query Design
 With the 
Query Design, you can create and edit a query or view.
 
-Query Through Several Tables
+Query Through Several Tables
 The query 
result can contain data from several tables if these are linked to each other 
by suitable data fields.
-Formulating Query Criteria
+Formulating Query Criteria
 You can find 
out which operators and commands can be used to formulate the filter conditions 
for a query.
-Executing Functions
+Executing Functions
 You can 
perform calculations with the data of a table and store the results as a query 
result.
 
 
diff --git a/source/text/sdatabase/0202.xhp 
b/source/text/sdatabase/0202.xhp
index 5181290fb..99024ab9a 100644
--- a/source/text/sdatabase/0202.xhp
+++ b/source/text/sdatabase/0202.xhp
@@ -33,10 +33,10 @@
 How to continue?
 There are 
three options available for answering this question:
 Do you really want to open the query in the graphic 
view?
-Allows you to open the query in the Design 
View in spite of missing elements. This option also allows you 
to specify if other errors need to be ignored.
+Allows you to open the query in the Design View in 
spite of missing elements. This option also allows you to specify if 
other errors need to be ignored.
 The query is 
opened in the Design View (the graphical interface). Missing tables appear 
blank and invalid fields appear with their (invalid) names in the list of 
fields. This lets you work with exactly those fields that caused the 
error.
 Open the query in the SQL View
-Allows you to open the query design in the SQL 
Mode and to interpret the query as a Native SQL. 
You can only quit the native SQL mode when the $[officename] statement is 
completely interpreted (only possible if the used tables or fields in the query 
really exist).
+Allows you to open the query design in the SQL Mode and to 
in

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

2020-07-21 Thread Olivier Hallot (via logerrit)
 AllLangHelp_sdatabase.mk   |1 
 AllLangHelp_shared.mk  |1 
 source/text/sdatabase/main.xhp |2 -
 source/text/sdatabase/toolbars.xhp |   49 +
 4 files changed, 25 insertions(+), 28 deletions(-)

New commits:
commit ff89d81b75252cfb533e748ee2f46eaa3183e15e
Author: Olivier Hallot 
AuthorDate: Tue Jul 21 21:15:48 2020 -0300
Commit: Olivier Hallot 
CommitDate: Wed Jul 22 02:26:47 2020 +0200

Move Help page to new location

Change-Id: Ic5ebc94e84f1867c1699d9fddb2ce362e872ed37
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/99182
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index 95b1c6b14..4065e5c30 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
 helpcontent2/source/text/sdatabase/main \
 helpcontent2/source/text/sdatabase/0200 \
 helpcontent2/source/text/sdatabase/0202 \
+helpcontent2/source/text/sdatabase/toolbars \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 81ccbb5e1..1f1439322 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -932,7 +932,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/explorer/database/tablewizard02 \
 helpcontent2/source/text/shared/explorer/database/tablewizard03 \
 helpcontent2/source/text/shared/explorer/database/tablewizard04 \
-helpcontent2/source/text/shared/explorer/database/toolbars \
 ,shared/explorer/database))
 
 # vim: set noet sw=4 ts=4:
diff --git a/source/text/sdatabase/main.xhp b/source/text/sdatabase/main.xhp
index bd68a21a0..98c7dedfd 100644
--- a/source/text/sdatabase/main.xhp
+++ b/source/text/sdatabase/main.xhp
@@ -94,7 +94,7 @@

 
 
-   
+   
 
 
 https://wiki.documentfoundation.org/Database"; 
name="wiki.documentfoundation.org Database">Wiki page about 
Base
diff --git a/source/text/shared/explorer/database/toolbars.xhp 
b/source/text/sdatabase/toolbars.xhp
similarity index 71%
rename from source/text/shared/explorer/database/toolbars.xhp
rename to source/text/sdatabase/toolbars.xhp
index 119f3f225..a33981c4d 100644
--- a/source/text/shared/explorer/database/toolbars.xhp
+++ b/source/text/sdatabase/toolbars.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-   
 
 
 
 Toolbars
-/text/shared/explorer/database/toolbars.xhp
+/text/sdatabase/toolbars.xhp
 
 
 database toolbars
 
 
 
-Toolbars
-
+Toolbars
+
 In a database 
file window, you can see the following toolbars.
-Table
+Table
 
-Open 
database object
+Open database object
 Opens the selected table so you can enter, edit, or delete 
records.
 
-Edit
+Edit
 Opens the selected table so you can change the 
structure.
 
-Delete
+Delete
 Deletes the selected table.
 
-Rename
+Rename
 Renames the selected table.
-Query
+Query
 
-Open 
database object
+Open database object
 Opens the selected query so you can enter, edit, or delete 
records.
 
-Edit
+Edit
 Opens the selected query so you can change the 
structure.
 
-Delete
+Delete
 Deletes the selected query.
 
-Rename
+Rename
 Renames the selected query.
-Form
+Form
 
-Open 
database object
+Open database object
 Opens the selected form so you can enter, edit, or delete 
records.
 
-Edit
+Edit
 Opens the selected form so you can change the 
layout.
 
-Delete
+Delete
 Deletes the selected form.
 
-Rename
+Rename
 Renames the selected form.
-Report
+Report
 
-Open 
database object
+Open database object
 Opens the selected report so you can enter, edit, or delete 
records.
 
-Edit
+Edit
 Opens the selected report so you can change the 
layout.
 
-Delete
+Delete
 Deletes the selected report.
 
-Rename
+Rename
 Renames the selected report.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-06-29 Thread Olivier Hallot (via logerrit)
 AllLangHelp_sdatabase.mk   |2 ++
 AllLangHelp_shared.mk  |2 --
 source/text/sdatabase/0200.xhp |   25 ++---
 source/text/sdatabase/0202.xhp |   21 -
 source/text/shared/guide/database_main.xhp |2 +-
 5 files changed, 21 insertions(+), 31 deletions(-)

New commits:
commit 971425d46a52037cc1bead7c0a1054d84c10e56b
Author: Olivier Hallot 
AuthorDate: Mon Jun 29 16:04:38 2020 -0300
Commit: Olivier Hallot 
CommitDate: Mon Jun 29 21:08:39 2020 +0200

refactor some database Help files

Change-Id: Ia3ad2896015c335450d0970d8cf51044473e249e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97456
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index d438789b8..95b1c6b14 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -17,6 +17,8 @@ $(eval $(call gb_AllLangHelp_use_linked_modules,sdatabase,\
 
 $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
 helpcontent2/source/text/sdatabase/main \
+helpcontent2/source/text/sdatabase/0200 \
+helpcontent2/source/text/sdatabase/0202 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 34fbafb3d..7664dc444 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -854,8 +854,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 ))
 
 $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
-helpcontent2/source/text/shared/explorer/database/0200 \
-helpcontent2/source/text/shared/explorer/database/0202 \
 helpcontent2/source/text/shared/explorer/database/02010100 \
 helpcontent2/source/text/shared/explorer/database/02010101 \
 helpcontent2/source/text/shared/explorer/database/0400 \
diff --git a/source/text/shared/explorer/database/0200.xhp 
b/source/text/sdatabase/0200.xhp
similarity index 73%
rename from source/text/shared/explorer/database/0200.xhp
rename to source/text/sdatabase/0200.xhp
index d73d23d62..2a6c9903a 100644
--- a/source/text/shared/explorer/database/0200.xhp
+++ b/source/text/sdatabase/0200.xhp
@@ -1,7 +1,4 @@
 
-
-
-
 
-
-
-   
+
 
 
 Queries
-/text/shared/explorer/database/0200.xhp
+/text/sdatabase/0200.xhp
 
 
 
@@ -34,14 +29,14 @@
 tables in databases; printing queries (Base)
 printing; queries (Base)
 queries; printing (Base)
-mw added "(Base)" to all entries Queries
+mw added "(Base)" to all entries Queries
 A "query" is a 
special view of a table. A query can display chosen records or chosen fields 
within records; it can also sort those records. A query can apply to one table 
or to multiple tables, if they are linked by common data 
fields.i73680
 
 
   
 
 Use queries to 
find records from data tables based on certain criteria. All queries created 
for a database are listed under the Queries entry. Since this 
entry contains the database queries, it is also called the "query 
container".
-Printing Queries
+Printing Queries
 To print a 
query or table:
 
 
@@ -61,17 +56,17 @@
 Print the 
document by choosing File - Print.
 
 
-You can also open 
the data source view (Ctrl+Shift+F4), select the entire database table in the 
data source view (click on the top left corner of the table), and then drag the 
selection to a text document or spreadsheet.
-Sorting and 
Filtering Data
+You can also open the data source view 
(Ctrl+Shift+F4), select the entire database table in the data source view 
(click on the top left corner of the table), and then drag the selection to a 
text document or spreadsheet.
+Sorting and Filtering Data
 Allows you to 
sort and filter the data in a query table.
-Query 
Design
+Query Design
 With the 
Query Design, you can create and edit a query or view.
 
-Query Through Several Tables
+Query Through Several Tables
 The query 
result can contain data from several tables if these are linked to each other 
by suitable data fields.
-Formulating Query Criteria
+Formulating Query Criteria
 You can find 
out which operators and commands can be used to formulate the filter conditions 
for a query.
-Executing Functions
+Executing Functions
 You can 
perform calculations with the data of a table and store the results as a query 
result.
 
 
diff --git a/source/text/shared/explorer/database/0202.xhp 
b/source/text/sdatabase/0202.xhp
similarity index 81%
rename from source/text/shared/explorer/database/0202.xhp
rename to source/text/sdatabase/0202.xhp
index 9237c7d6b..5181290fb 100644
--- a/source/text/shared/explorer/database/0202.xhp
+++ b/source/text/sdatabase/0202.xhp
@@ -1,7 +1,4 @@
 
-
-
-
 
-
-
-   
+
 
 
 Missing Element
-/text/shared/explorer/database/0202.xhp
+/text/sdatabase/0202.xhp
 
 
 
 queries; missing elements 
(Base)
-mw added "(Base)"Missing Element
+mw added "(Base)"Missing 
Element
 If a query in 
wh