11 files changed, 128 insertions, 92 deletions
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 69d7bb5341..1157d06aa7 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -350,6 +350,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/01/grid_and_helplines \
     helpcontent2/source/text/shared/01/guides \
     helpcontent2/source/text/shared/01/image_compression \
+    helpcontent2/source/text/shared/01/insert_chart \
     helpcontent2/source/text/shared/01/mediaplayer \
     helpcontent2/source/text/shared/01/menu_edit_find \
     helpcontent2/source/text/shared/01/menu_view_sidebar \
@@ -387,7 +388,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/01/select_template_category \
     helpcontent2/source/text/shared/01/timestampauth \
     helpcontent2/source/text/shared/01/view_comments \
-    helpcontent2/source/text/shared/guide/tipoftheday \
     helpcontent2/source/text/shared/01/webhtml \
     helpcontent2/source/text/shared/01/xformsdata \
     helpcontent2/source/text/shared/01/xformsdataadd \
@@ -766,6 +766,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/guide/template_manager \
     helpcontent2/source/text/shared/guide/text_color \
     helpcontent2/source/text/shared/guide/textmode_change \
+    helpcontent2/source/text/shared/guide/tipoftheday \
     helpcontent2/source/text/shared/guide/undo_formatting \
     helpcontent2/source/text/shared/guide/version_number \
     helpcontent2/source/text/shared/guide/viewing_file_properties \
@@ -793,7 +794,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/submenu_spacing \
     helpcontent2/source/text/shared/menu/forms \
     helpcontent2/source/text/shared/menu/comment_menu \
-    helpcontent2/source/text/shared/menu/insert_chart \
     helpcontent2/source/text/shared/menu/insert_form_control \
     helpcontent2/source/text/shared/menu/insert_shape \
     helpcontent2/source/text/shared/menu/save_image \
diff --git a/source/text/sdraw/main0213.xhp b/source/text/sdraw/main0213.xhp
index 66be8426ef..e2a8c48e14 100644
--- a/source/text/sdraw/main0213.xhp
+++ b/source/text/sdraw/main0213.xhp
@@ -42,14 +42,18 @@
 <h2 id="hd_id3149018" xml-lang="en-US"><link href="text/shared/02/01171400.xhp">Helplines While Moving</link></h2>
 <embed href="text/shared/optionen/01070100.xhp#verschieb"/>
 <embed href="text/shared/02/01171400.xhp#syhline"/>
+
 <section id="Snap_to_Grid_and_Guides">
-<h2 id="hd_id3147338" xml-lang="en-US"><link href="text/shared/02/01171300.xhp">Snap to Grid</link></h2>
-<embed href="text/shared/optionen/01050100.xhp#snap_to_grid"/>
-<embed href="text/shared/02/01171300.xhp#sysnap_to_grid"/>
+
+<embed href="text/shared/02/01171300.xhp#snap2grid"/>
+<embed href="text/shared/00/00000004.xhp#sysnap2grid"/>
+
+
 <h2 id="hd_id3146313" xml-lang="en-US"><link href="text/simpress/02/13140000.xhp">Snap to Snap Guides</link></h2>
 <embed href="text/shared/optionen/01070300.xhp#anlinie"/>
 <embed href="text/simpress/02/13140000.xhp#sysnap_to_snap_guides"/>
 </section>
+
 <section id="Snap_to_Page">
 <h2 id="hd_id3155111" xml-lang="en-US"><link href="text/simpress/02/13150000.xhp">Snap to Page Margins</link></h2>
 <embed href="text/shared/optionen/01070300.xhp#seitenrand"/>
diff --git a/source/text/sdraw/main_insert.xhp b/source/text/sdraw/main_insert.xhp
index 6b4cce2236..8988f26aeb 100644
--- a/source/text/sdraw/main_insert.xhp
+++ b/source/text/sdraw/main_insert.xhp
@@ -33,7 +33,7 @@
       </section>
 
       <embed href="text/shared/01/04140000.xhp#insertimageh1"/>
-      <embed href="text/shared/menu/insert_chart.xhp#chart"/>
+      <embed href="text/shared/01/insert_chart.xhp#chart"/>
       <h2 id="hd_id3156385"><link href="text/simpress/01/04080100.xhp">Table</link></h2>
       <embed href="text/simpress/01/04080100.xhp#tabelletext"/>
       <embed href="text/shared/01/04990000.xhp#media_submenu"/>
diff --git a/source/text/shared/01/insert_chart.xhp b/source/text/shared/01/insert_chart.xhp
new file mode 100644
index 0000000000..95d7d2410f
--- /dev/null
+++ b/source/text/shared/01/insert_chart.xhp
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
+
+<meta>
+  <topic id="textsharedmenuinsert_chartxml">
+    <title id="tit">Chart</title>
+    <filename>/text/shared/menu/insert_chart.xhp</filename>
+  </topic>
+</meta>
+
+<body>
+
+<section id="chart">
+<bookmark branch="hid/.uno:InsertObjectChart" id="bm_id030420160952412994" localize="false"/>
+
+<h1 id="hd_id030420160945436725"><link href="text/shared/01/insert_chart.xhp">Chart</link></h1>
+<paragraph id="par_id030420160947559665" role="paragraph"><ahelp hid=".">Inserts a chart based on data from a cell or table range or with default data.</ahelp></paragraph>
+</section>
+
+<section id="howtoget">
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph role="paragraph" id="par_id391687290602711">Choose <menuitem>Insert - Chart</menuitem>.</paragraph>
+  <switch select="appl">
+    <case select="BASE"/>
+    <case select="MATH"/>
+    <case select="DRAW">
+      <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+      <paragraph role="paragraph" id="par_id481687292947011"><menuitem>Home - Insert Chart</menuitem>.</paragraph>
+      <paragraph role="paragraph" id="par_id611687292960477"><menuitem>Insert - Chart</menuitem>.</paragraph>
+    </case>
+    <default>
+      <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+      <paragraph role="paragraph" id="par_id21687293634109"><menuitem>Insert - Chart</menuitem>.</paragraph>
+    </default>
+  </switch>
+  <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+  <table id="tab_id291687290321938">
+    <tablerow>
+      <tablecell>
+        <paragraph id="par_id791687290321939" role="paragraph"><image src="cmd/lc_drawchart.svg" id="img_id981687290321940" width="1cm" height="1cm"><alt id="alt_id311687290321941">Icon Chart</alt></image></paragraph>
+      </tablecell>
+      <tablecell>
+        <paragraph id="par_id521687290321944" role="paragraph">Chart</paragraph>
+      </tablecell>
+    </tablerow>
+  </table>
+</section>
+
+<section id="relatedtopics">
+<embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
+<embed href="text/schart/01/wiz_chart_type.xhp#wiz_chart_type"/>
+<embed href="text/schart/01/wiz_data_range.xhp#wiz_data_range"/>
+<embed href="text/schart/01/wiz_data_series.xhp#wiz_data_series"/>
+<embed href="text/schart/01/wiz_chart_elements.xhp#wiz_chart_elements"/>
+<embed href="text/shared/guide/chart_axis.xhp#chart_axis"/>
+<embed href="text/shared/guide/chart_legend.xhp#chart_legend"/>
+<embed href="text/shared/guide/chart_title.xhp#chart_title"/>
+<embed href="text/shared/guide/chart_barformat.xhp#chart_barformat"/>
+</section>
+</body>
+
+</helpdocument>
diff --git a/source/text/shared/01/selectcertificate.xhp b/source/text/shared/01/selectcertificate.xhp
index 4b9951e84a..89ffd4f8fc 100644
--- a/source/text/shared/01/selectcertificate.xhp
+++ b/source/text/shared/01/selectcertificate.xhp
@@ -20,28 +20,28 @@
 
 <meta>
 <topic id="textshared01selectcertificatexhp" indexer="include">
-<title id="tit" xml-lang="en-US">Select Certificate</title>
+<title id="tit">Select Certificate</title>
 <filename>/text/shared/01/selectcertificate.xhp</filename>
 </topic>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/xmlsec/ui/selectcertificatedialog/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/xmlsec/ui/selectcertificatedialog/SelectCertificateDialog" id="bm_id3150017" localize="false"/>
-<h1 id="par_idN10541" xml-lang="en-US" >Select Certificate</h1>
-<paragraph role="paragraph" id="par_idN10545" xml-lang="en-US"><ahelp hid=".">Select the certificate that you want to <link href="text/shared/01/digitalsignatures.xhp">digitally sign</link> the current document with.</ahelp></paragraph>
+<bookmark branch="hid/xmlsec/ui/selectcertificatedialog/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
+<bookmark branch="hid/xmlsec/ui/selectcertificatedialog/SelectCertificateDialog" id="bm_id3150017" localize="false"/>
+<h1 id="par_idN10541">Select Certificate</h1>
+<paragraph role="paragraph" id="par_idN10545"><ahelp hid=".">Select the certificate that you want to <link href="text/shared/01/digitalsignatures.xhp">digitally sign</link> the current document with.</ahelp></paragraph>
 <section id="howtoget">
-<embed href="text/shared/00/00000401.xhp#digitalsigs"/>
-<embed href="text/shared/00/00000401.xhp#digitalsigsel"/>
+<embed href="text/shared/00/00000401.xhp#digitalsig"/>
 </section>
+
 <embed href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
-<bookmark xml-lang="en-US" branch="hid/xmlsec/ui/selectcertificatedialog/signatures" id="bm_id8177129" localize="false"/>
-<h2 id="par_idN1056A" xml-lang="en-US">List</h2>
-<paragraph role="paragraph" id="par_idN1056E" xml-lang="en-US"><ahelp hid=".">Select the certificate that you want to digitally sign the current document with.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsec/ui/selectcertificatedialog/viewcert" id="bm_id5101168" localize="false"/>
-<h2 id="par_idN10571" xml-lang="en-US">View Certificate</h2>
-<paragraph role="paragraph" id="par_idN10575" xml-lang="en-US"><ahelp hid=".">Opens the <link href="text/shared/optionen/viewcertificate.xhp">View Certificate</link> dialog where you can examine the selected certificate.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/xmlsec/ui/selectcertificatedialog/description" id="bm_id3395794" localize="false"/>
-<h2 id="par_idN10572" xml-lang="en-US">Description</h2>
-<paragraph role="paragraph" id="par_idN10576" xml-lang="en-US"><ahelp hid=".">Type a purpose for the signature.</ahelp></paragraph>
+<bookmark branch="hid/xmlsec/ui/selectcertificatedialog/signatures" id="bm_id8177129" localize="false"/>
+<h2 id="par_idN1056A">List</h2>
+<paragraph role="paragraph" id="par_idN1056E"><ahelp hid=".">Select the certificate that you want to digitally sign the current document with.</ahelp></paragraph>
+<bookmark branch="hid/xmlsec/ui/selectcertificatedialog/viewcert" id="bm_id5101168" localize="false"/>
+<h2 id="par_idN10571">View Certificate</h2>
+<paragraph role="paragraph" id="par_idN10575"><ahelp hid=".">Opens the <link href="text/shared/optionen/viewcertificate.xhp">View Certificate</link> dialog where you can examine the selected certificate.</ahelp></paragraph>
+<bookmark branch="hid/xmlsec/ui/selectcertificatedialog/description" id="bm_id3395794" localize="false"/>
+<h2 id="par_idN10572">Description</h2>
+<paragraph role="paragraph" id="par_idN10576"><ahelp hid=".">Type a purpose for the signature.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/shared/02/01171300.xhp b/source/text/shared/02/01171300.xhp
index 7cc576a8de..be57ee666e 100644
--- a/source/text/shared/02/01171300.xhp
+++ b/source/text/shared/02/01171300.xhp
@@ -27,7 +27,7 @@
 <bookmark branch="hid/.uno:GridUse" id="bm_id571686516768822" localize="false"/>
 <section id="snap2grid">
     <h1 id="hd_id3151262"><link href="text/shared/02/01171300.xhp">Snap to Grid</link></h1>
-<paragraph role="paragraph" id="par_id3149495" xml-lang="en-US"><ahelp hid=".">Specifies whether to move frames, drawing elements, and controls only between grid points.</ahelp></paragraph>
+    <embed href="text/shared/optionen/01050100.xhp#snap_to_grid"/>
 </section>
 <paragraph id="par_idN10589" role="paragraph">Automatically aligns objects to vertical and horizontal grid lines.</paragraph>
 <section id="howtoget">
diff --git a/source/text/shared/main0201.xhp b/source/text/shared/main0201.xhp
index abadee0915..67a5d04ffd 100644
--- a/source/text/shared/main0201.xhp
+++ b/source/text/shared/main0201.xhp
@@ -110,7 +110,7 @@
 <embed href="text/swriter/00/00000404.xhp#syinsert_table"/>
 <h2 id="par_idN108C4"><link href="text/shared/02/01171200.xhp">Display Grid</link></h2>
 <embed href="text/shared/optionen/01050100.xhp#rastersicht"/>
-<embed href="text/shared/02/01171200.xhp#sydisplay_grid"/>
+<embed href="text/shared/00/00000004.xhp#sydisplaygrid"/>
 </case>
 <case select="DRAW">
 <h2 id="par_idN108D7"><link href="text/schart/01/wiz_chart_type.xhp">Chart</link></h2>
@@ -124,10 +124,10 @@
 <embed href="text/shared/02/01220000.xhp#synavigator"/>
 <switch select="appl">
 <case select="WRITER"><embed href="text/shared/01/gallery.xhp#stargallery"/>
-<embed href="text/shared/00/00000406.xhp#sygallery"/>
+<embed href="text/shared/01/gallery.xhp#sygallery"/>
 </case>
 <case select="CALC"><embed href="text/shared/01/gallery.xhp#stargallery"/>
-<embed href="text/shared/00/00000406.xhp#sygallery"/>
+<embed href="text/shared/01/gallery.xhp#sygallery"/>
 </case>
 </switch>
 <embed href="text/shared/01/03010000.xhp#zoom"/>
diff --git a/source/text/shared/main0226.xhp b/source/text/shared/main0226.xhp
index 225a4afdf2..a050c7272e 100644
--- a/source/text/shared/main0226.xhp
+++ b/source/text/shared/main0226.xhp
@@ -84,14 +84,13 @@
 <embed href="text/shared/01/05230000.xhp#position_and_size"/>
 <embed href="text/shared/00/00040502.xhp#syposition"/>
 
-<h2 id="hd_id3150398"><link href="text/shared/02/01171200.xhp">Display Grid</link></h2>
-<embed href="text/shared/optionen/01050100.xhp#rastersicht"/>
-<embed href="text/shared/02/01171200.xhp#sydisplay_grid"/>
+<embed href="text/shared/02/01171200.xhp#displaygrid"/>
+<embed href="text/shared/00/00000004.xhp#sydisplaygrid"/>
 
 <bookmark xml-lang="en-US" branch="hid/.uno:GridUse" id="bm_id5272811" localize="false"/>
-<h2 id="hd_id3148798"><link href="text/shared/02/01171300.xhp">Snap to Grid</link></h2>
-<paragraph role="paragraph" id="par_id3145419" xml-lang="en-US"><ahelp hid=".uno:GridUse">Specifies that you can move objects only between grid points.</ahelp></paragraph>
-<embed href="text/shared/02/01171300.xhp#sysnap_to_grid"/>
+<embed href="text/shared/02/01171300.xhp#snap2grid"/>
+<embed href="text/shared/00/00000004.xhp#sysnap2grid"/>
+
 
 <h2 id="hd_id3148920"><link href="text/shared/02/01171400.xhp">Helplines While Moving</link></h2>
 <embed href="text/shared/optionen/01070100.xhp#verschieb"/>
diff --git a/source/text/shared/menu/insert_chart.xhp b/source/text/shared/menu/insert_chart.xhp
deleted file mode 100644
index 652d8920c1..0000000000
--- a/source/text/shared/menu/insert_chart.xhp
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<helpdocument version="1.0">
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-
-<meta>
-  <topic id="textsharedmenuinsert_chartxml">
-    <title id="tit" xml-lang="en-US">Chart</title>
-    <filename>/text/shared/menu/insert_chart.xhp</filename>
-  </topic>
-</meta>
-
-<body>
-
-
-<section id="chart">
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertObjectChart" id="bm_id030420160952412994" localize="false"/>
-
-<h1 id="hd_id030420160945436725"><link href="text/shared/menu/insert_chart.xhp">Chart</link></h1>
-<paragraph id="par_id030420160947559665" role="paragraph" xml-lang="en-US"><ahelp hid=".">Inserts a chart based on data from a cell or table range or with default data.</ahelp></paragraph>
-</section>
-
-<section id="relatedtopics">
-<embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
-<embed href="text/schart/01/wiz_chart_type.xhp#wiz_chart_type"/>
-<embed href="text/schart/01/wiz_data_range.xhp#wiz_data_range"/>
-<embed href="text/schart/01/wiz_data_series.xhp#wiz_data_series"/>
-<embed href="text/schart/01/wiz_chart_elements.xhp#wiz_chart_elements"/>
-<embed href="text/shared/guide/chart_axis.xhp#chart_axis"/>
-<embed href="text/shared/guide/chart_legend.xhp#chart_legend"/>
-<embed href="text/shared/guide/chart_title.xhp#chart_title"/>
-<embed href="text/shared/guide/chart_barformat.xhp#chart_barformat"/>
-</section>
-</body>
-
-</helpdocument>
-\ No newline at end of file
diff --git a/source/text/simpress/main0213.xhp b/source/text/simpress/main0213.xhp
index 725be01b88..00af869933 100644
--- a/source/text/simpress/main0213.xhp
+++ b/source/text/simpress/main0213.xhp
@@ -37,17 +37,21 @@
   <embed href="text/simpress/00/00000403.xhp#option"/>
 </section><comment>UFI: changed some links, see #i52549</comment><embed href="text/simpress/02/13020000.xhp#rotation_mode"/>
 <embed href="text/simpress/02/13020000.xhp#syrotation_mode"/>
-<h2 id="hd_id3148487"><link href="text/shared/02/01171200.xhp">Display Grid</link></h2>
-<embed href="text/shared/optionen/01050100.xhp#rastersicht"/>
-<embed href="text/shared/02/01171200.xhp#sydisplay_grid"/>
+
+<embed href="text/shared/02/01171200.xhp#displaygrid"/>
+<embed href="text/shared/00/00000004.xhp#sydisplaygrid"/>
+
 <embed href="text/simpress/02/13050000.xhp#show_snap_lines"/>
 <embed href="text/simpress/02/13050000.xhp#syshow_snap_lines"/>
+
 <h2 id="hd_id3148700"><link href="text/shared/02/01171400.xhp">Helplines While Moving</link></h2>
 <embed href="text/shared/optionen/01070100.xhp#verschieb"/>
 <embed href="text/shared/02/01171400.xhp#syhline"/>
-<h2 id="hd_id3149603"><link href="text/shared/02/01171300.xhp">Snap to Grid</link></h2>
-<embed href="text/shared/optionen/01050100.xhp#snap_to_grid"/>
-<embed href="text/shared/02/01171300.xhp#sysnap_to_grid"/>
+
+<embed href="text/shared/02/01171300.xhp#snap2grid"/>
+<embed href="text/shared/00/00000004.xhp#sysnap2grid"/>
+
+
 <h2 id="hd_id3143233"><link href="text/simpress/02/13140000.xhp">Snap to Snap Lines</link></h2>
 <embed href="text/shared/optionen/01070300.xhp#anlinie"/>
 <embed href="text/simpress/02/13140000.xhp#sysnap_to_snap_guides"/>
diff --git a/source/text/swriter/main0104.xhp b/source/text/swriter/main0104.xhp
index 581a9e7d51..bb9db93b4e 100644
--- a/source/text/swriter/main0104.xhp
+++ b/source/text/swriter/main0104.xhp
@@ -34,9 +34,10 @@
 <h2 id="hd_id030420160850525240" xml-lang="en-US">Page Break</h2>
 <paragraph id="par_id030420160850533104" role="paragraph" xml-lang="en-US"><ahelp hid=".uno:InsertPagebreak">Inserts a manual page break at the current cursor position and places the cursor at the beginning of the next page.</ahelp></paragraph>
 <embed href="text/swriter/menu/submenu_more_breaks.xhp#morebreaks_submenu"/>
-<h2 id="hd_id3158442" xml-lang="en-US"><link href="text/shared/01/04140000.xhp">Image</link></h2>
-<embed href="text/shared/01/04140000.xhp#image_text"/>
-<embed href="text/shared/menu/insert_chart.xhp#chart"/>
+
+<embed href="text/shared/01/04140000.xhp#insertimageh1"/>
+<embed href="text/shared/01/insert_chart.xhp#chart"/>
+
 <embed href="text/shared/01/04990000.xhp#media_submenu"/>
 <embed href="text/shared/01/04150000.xhp#object_submenu"/>
 <embed href="text/shared/menu/insert_shape.xhp#shape_submenu"/>