tdf#154996 Add tabbed UI commands in Help page

+ refactoring
+ Writer View menu (part 3)

Change-Id: Id20a4466894c199c229c54c8228b818f4c166126
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152869
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
(cherry picked from commit 05cb445d5f273ccbeb80b1af28bcb1a13e9b8b14)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/153215

13 files changed, 313 insertions, 164 deletions

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index cb60ea34e8..4af2ccd6ae 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -347,7 +347,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/01/font_features \
     helpcontent2/source/text/shared/01/gallery \
     helpcontent2/source/text/shared/01/gallery_files \
-    helpcontent2/source/text/shared/01/grid \
     helpcontent2/source/text/shared/01/grid_and_helplines \
     helpcontent2/source/text/shared/01/guides \
     helpcontent2/source/text/shared/01/image_compression \
@@ -381,6 +380,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/01/ref_pdf_export_user_interface \
     helpcontent2/source/text/shared/01/ref_pdf_export_universal_accessibility \
     helpcontent2/source/text/shared/01/ref_pdf_send_as \
+    helpcontent2/source/text/shared/01/scrollbars \
     helpcontent2/source/text/shared/01/signexistingpdf \
     helpcontent2/source/text/shared/01/securitywarning \
     helpcontent2/source/text/shared/01/selectcertificate \
@@ -530,6 +530,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/02/colortoolbar \
     helpcontent2/source/text/shared/02/flowcharts \
     helpcontent2/source/text/shared/02/fontwork \
+    helpcontent2/source/text/shared/02/gridtofront \
     helpcontent2/source/text/shared/02/limit \
     helpcontent2/source/text/shared/02/namedialog \
     helpcontent2/source/text/shared/02/paintbrush \
diff --git a/source/text/sdraw/main0213.xhp b/source/text/sdraw/main0213.xhp
index 5002822fa3..66be8426ef 100644
--- a/source/text/sdraw/main0213.xhp
+++ b/source/text/sdraw/main0213.xhp
@@ -33,9 +33,10 @@
   <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_id3145251" xml-lang="en-US" ><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_id3149018" xml-lang="en-US"><link href="text/shared/02/01171400.xhp">Helplines While Moving</link></h2>
diff --git a/source/text/shared/00/00000004.xhp b/source/text/shared/00/00000004.xhp
index 515149a081..207d614d51 100644
--- a/source/text/shared/00/00000004.xhp
+++ b/source/text/shared/00/00000004.xhp
@@ -334,7 +334,7 @@
 </tablecell>
 </tablerow>
 </table>
-
+</section>
 <section id="sysflipvertically">
     <table id="tab_id301683469573188">
     <tablerow>
@@ -365,38 +365,94 @@
     </table>
 </section>
 
-<section id="sydisplaygrid">
-    <table id="tab_id1001683472735655">
-    <tablerow>
-        <tablecell>
-            <paragraph id="par_id771683472735656" role="paragraph">
-                <image src="cmd/lc_gridvisible.svg" id="img_id401683472735657" width="1cm"  height="1cm"><alt xml-lang="en-US" id="alt_id361683472735658">Icon Display Grid</alt></image>
-            </paragraph>
-        </tablecell>
-        <tablecell>
-            <paragraph id="par_id771683472735660" role="paragraph" xml-lang="en-US">Display Grid</paragraph>
-        </tablecell>
-    </tablerow>
-    </table>
+<section id="displaygrid">
+    <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+    <paragraph role="paragraph" id="par_id441686510141372">Choose <menuitem>View - Grid and Helplines - Display Grid</menuitem>.</paragraph>
+    <switch select="appl">
+        <case select="IMPRESS">
+            <embed href="text/shared/00/00000004.xhp#from_context"/>
+            <paragraph role="paragraph" id="par_id231686510344563"><menuitem>Grid and Helplines - Display Grid</menuitem></paragraph>
+        </case>
+        <case select="DRAW">
+            <embed href="text/shared/00/00000004.xhp#from_context"/>
+            <paragraph role="paragraph" id="par_id231686520344563"><menuitem>Grid and Helplines - Display Grid</menuitem></paragraph>
+        </case>
+    </switch>
+    <switch select="appl">
+        <case select="CALC"/>
+        <case select="MATH"/>
+        <case select="BASE"/>
+        <default>
+            <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+            <paragraph role="paragraph" id="par_id731686511199721">Choose <menuitem>View - Display Grid</menuitem>.</paragraph>
+        </default>
+    </switch>
+    <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+    <section id="sydisplaygrid">
+        <table id="tab_id1001683472735655">
+            <tablerow>
+                <tablecell>
+                    <paragraph id="par_id771683472735656" role="paragraph">
+                        <image src="cmd/lc_gridvisible.svg" id="img_id401683472735657" width="1cm"  height="1cm"><alt xml-lang="en-US" id="alt_id361683472735658">Icon Display Grid</alt></image>
+                    </paragraph>
+                </tablecell>
+                <tablecell>
+                    <paragraph id="par_id771683472735660" role="paragraph" xml-lang="en-US">Display Grid</paragraph>
+                </tablecell>
+            </tablerow>
+        </table>
+    </section>
 </section>
 
-<section id="sysnap2grid">
-    <table id="tab_id411683472792070">
-    <tablerow>
-        <tablecell>
-            <paragraph id="par_id491683472792071" role="paragraph">
-                <image src="cmd/lc_griduse.svg" id="img_id631683472792072" width="1cm"  height="1cm"><alt xml-lang="en-US" id="alt_id571683472792073">Icon Snap to Grid</alt></image>
-            </paragraph>
-        </tablecell>
-        <tablecell>
-            <paragraph id="par_id761683472792075" role="paragraph" xml-lang="en-US">Snap to Grid</paragraph>
-        </tablecell>
-    </tablerow>
-    </table>
+<section id="snaptogrid">
+    <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+    <paragraph role="paragraph" id="par_id391686514191362">Choose <menuitem>View - Grid and Helplines - Snap to Grid</menuitem>.</paragraph>
+    <switch select="appl">
+        <case select="IMPRESS">
+            <embed href="text/shared/00/00000004.xhp#from_context"/>
+            <paragraph role="paragraph" id="par_id331686510344563"><menuitem>Grid and Helplines - Snap to Grid</menuitem></paragraph></case>
+        <case select="DRAW">
+            <embed href="text/shared/00/00000004.xhp#from_context"/>
+            <paragraph role="paragraph" id="par_id231786520344563"><menuitem>Grid and Helplines - Snap to Grid</menuitem></paragraph></case>
+    </switch>
+    <switch select="appl">
+        <case select="CALC"/>
+        <case select="MATH"/>
+        <case select="BASE"/>
+        <case select="WRITER">
+            <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+            <paragraph role="paragraph" id="par_id591686513073200">Choose <menuitem>View - Snap to Grid</menuitem>.</paragraph>
+            <paragraph role="paragraph" id="par_id681686516301373">On the <menuitem>View</menuitem> menu, choose <menuitem>Snap to Grid</menuitem>.</paragraph>
+        </case>
+        <case select="IMPRESS">
+            <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+            <paragraph role="paragraph" id="par_id641686513080593">Choose <menuitem>View - Snap to Grid</menuitem>.</paragraph>
+            <paragraph role="paragraph" id="par_id241686516194208">On the <menuitem>View</menuitem> menu, choose <menuitem>Snap to Grid</menuitem>.</paragraph>
+        </case>
+        <case select="DRAW">
+            <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+            <paragraph role="paragraph" id="par_id21686513087410">Choose <menuitem>Home - Snap to Grid</menuitem>.</paragraph>
+            <paragraph role="paragraph" id="par_id231686516211592">On the <menuitem>View</menuitem> menu, choose <menuitem>Snap to Grid</menuitem>.</paragraph>
+        </case>
+    </switch>
+    <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+    <section id="sysnap2grid">
+        <table id="tab_id411683472792070">
+            <tablerow>
+                <tablecell>
+                    <paragraph id="par_id491683472792071" role="paragraph">
+                        <image src="cmd/lc_griduse.svg" id="img_id631683472792072" width="1cm"  height="1cm"><alt xml-lang="en-US" id="alt_id571683472792073">Icon Snap to Grid</alt></image>
+                    </paragraph>
+                </tablecell>
+                <tablecell>
+                    <paragraph id="par_id761683472792075" role="paragraph" xml-lang="en-US">Snap to Grid</paragraph>
+                </tablecell>
+            </tablerow>
+        </table>
+    </section>
 </section>
 
 
-</section>
 <table id="tbl_id3145151">
 <tablerow>
 <tablecell>
diff --git a/source/text/shared/01/grid.xhp b/source/text/shared/01/grid.xhp
deleted file mode 100644
index 0651b2ae28..0000000000
--- a/source/text/shared/01/grid.xhp
+++ /dev/null
@@ -1,70 +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="textshared01gridxml" indexer="include" status="PUBLISH">
-    <title id="tit">Grid</title>
-    <filename>/text/shared/01/grid.xhp</filename>
-  </topic>
-</meta>
-
-<body>
-
-<section id="grid">
-<bookmark branch="index" id="bm_id4263435">
-  <bookmark_value>grids;display options (Impress/Draw)</bookmark_value>
-</bookmark>
-
-<bookmark branch="hid/.uno:GridMenu" id="bm_id9596240" localize="false"/>
-
-<h1 id="par_idN10565"><link href="text/shared/01/grid.xhp">Grid</link></h1>
-<paragraph id="par_id3147340" role="paragraph"><ahelp hid=".">Sets the display properties of a grid.</ahelp></paragraph>
-</section>
-
-<section id="howtoget">
-<embed href="text/shared/00/00000403.xhp#grid"/>
-</section>
-
-<section id="DisplayGrid">
-  <h2 id="par_idN1057E"><variable id="DisplayGridh1"><link href="text/shared/01/grid.xhp">Display Grid</link></variable></h2>
-<paragraph id="par_idN10582" role="paragraph">Displays or hides grid lines that you can use to align objects such as graphics on a page.</paragraph>
-<embed href="text/shared/00/00000004.xhp#sydisplaygrid"/>
-</section>
-
-<section id="Snap2Grid">
-  <h2 id="par_idN10585"><variable id="SnaptoGridh1"><link href="text/shared/01/grid.xhp">Snap to Grid</link></variable></h2>
-<paragraph id="par_idN10589" role="paragraph">Automatically aligns objects to vertical and horizontal grid lines.</paragraph>
-<embed href="text/shared/00/00000004.xhp#sysnap2grid"/>
-</section>
-
-<paragraph role="paragraph" id="par_id321683472243875">To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> key when you drag an object.</paragraph>
-
-<section id="GridtoFront">
-<h2 id="par_idN105C9">Grid to Front</h2>
-<paragraph id="par_idN105CD" role="paragraph"><ahelp hid=".">Displays the grid lines in front of the objects on the slide or page.</ahelp></paragraph>
-</section>
-
-<section id="relatedtopics">
-<paragraph id="par_id4372692" role="paragraph">Set the grid color on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences
-</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Application Colors</link>.</paragraph>
-</section>
-</body>
-
-</helpdocument>
diff --git a/source/text/shared/01/grid_and_helplines.xhp b/source/text/shared/01/grid_and_helplines.xhp
index f50c18ebd0..84567c593d 100644
--- a/source/text/shared/01/grid_and_helplines.xhp
+++ b/source/text/shared/01/grid_and_helplines.xhp
@@ -20,20 +20,48 @@
 
 <meta>
   <topic id="textshared01grid_and_helplinesxml">
-    <title id="tit" xml-lang="en-US">Grid and Help Lines</title>
+    <title id="tit">Grid and Help Lines</title>
     <filename>/text/shared/01/grid_and_helplines.xhp</filename>
   </topic>
 </meta>
 
 <body>
 <section id="grid_and_help_lines">
-<bookmark xml-lang="en-US" branch="hid/.uno:xxxx" id="bm_id03302017025726316" localize="false"/>
-
-<h1 id="hd_id033020170255198878" xml-lang="en-US"><link href="text/shared/01/grid_and_helplines.xhp">Grid and Help Lines</link></h1>
-<paragraph id="par_id033020170257116434" role="paragraph" xml-lang="en-US"><ahelp hid=".">Toggle the visibility of grid points and guide lines to help object moving and precise position in the current sheet.</ahelp></paragraph>
+<h1 id="hd_id033020170255198878"><link href="text/shared/01/grid_and_helplines.xhp">Grid and Help Lines</link></h1>
+<paragraph id="par_id033020170257116434" role="paragraph"><ahelp hid=".">Toggle the visibility of grid points and guide lines to help object moving and precise position in the current page.</ahelp></paragraph>
+</section>
+<section id="howtoget">
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph role="paragraph" id="par_id341686503897625">Choose <menuitem>View - Grid and Helplines</menuitem>.</paragraph>
+  <switch select="appl">
+    <case select="IMPRESS">
+      <embed href="text/shared/00/00000004.xhp#from_context"/>
+      <paragraph role="paragraph" id="par_id231686540344563"><menuitem>Grid and Helplines</menuitem></paragraph>
+    </case>
+    <case select="DRAW">
+      <embed href="text/shared/00/00000004.xhp#from_context"/>
+      <paragraph role="paragraph" id="par_id231686510344563"><menuitem>Grid and Helplines</menuitem></paragraph>
+    </case>
+  </switch>
 </section>
-<embed href="text/shared/01/grid.xhp#DisplayGrid"/>
-<embed href="text/shared/01/grid.xhp#GridtoFront"/>
+
+<embed href="text/shared/02/01171200.xhp#displaygrid"/>
+
+<switch select="appl">
+  <case select="WRITER"><embed href="text/shared/02/01171300.xhp#snap2grid"/></case>
+  <case select="CALC"><embed href="text/shared/02/01171300.xhp#snap2grid"/></case>
+</switch>
+
+<switch select="appl">
+  <case select="CALC"/>
+  <case select="WRITER"/>
+  <case select="MATH"/>
+  <case select="BASE"/>
+  <default>
+    <embed href="text/shared/02/gridtofront.xhp#grid2front"/>
+  </default>
+</switch>
+
 <embed href="text/shared/02/01171400.xhp#helplines_while_moving"/>
 </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/source/text/shared/01/scrollbars.xhp b/source/text/shared/01/scrollbars.xhp
new file mode 100644
index 0000000000..9c575cc80f
--- /dev/null
+++ b/source/text/shared/01/scrollbars.xhp
@@ -0,0 +1,84 @@
+<?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/.
+    *
+    -->
+
+<meta>
+    <topic id="page_topic" indexer="include" status="PUBLISH">
+        <title id="tit">Scroll Bars</title>
+        <filename>/text/shared/01/scrollbars.xhp</filename>
+    </topic>
+</meta>
+<body>
+<bookmark id="bm_id851686501614516" branch="hid/.uno:ScrollBar" localize="false"/>
+<section id="scrollbars">
+    <h1 id="hd_id761686501614517"><variable id="h1"><link href="text/shared/01/scrollbars.xhp">Scroll Bars</link></variable></h1>
+    <paragraph id="par_id102720150854017277" role="paragraph" xml-lang="en-US">Show or hide the horizontal and vertical scroll bars that are used to change the viewable area of a document that doesn't fit within the window.</paragraph>
+</section>
+<section id="howtoget">
+    <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+    <paragraph role="paragraph" id="par_id801686502182963">choose <menuitem>View - Scroll Bars</menuitem>.</paragraph>
+<embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+<table id="tab_id231686502048890">
+    <tablerow>
+        <tablecell>
+            <paragraph id="par_id491686502048891" role="paragraph">
+                <image src="cmd/lc_scrollbar.svg" id="img_id651686502048891" width="1cm"  height="1cm"><alt id="alt_id311686502048891">Icon Scroll Bars</alt></image>
+            </paragraph>
+        </tablecell>
+        <tablecell>
+            <paragraph id="par_id281686502048892" role="paragraph">Scroll Bars</paragraph>
+        </tablecell>
+    </tablerow>
+    </table>
+</section>
+
+<bookmark branch="hid/.uno:HScroll" id="bm_id121686502459535" localize="false"/>
+<h2 id="hd_id331686502211238">Horizontal Scroll Bar</h2>
+<paragraph role="paragraph" id="par_id661686502249462">Display the horizontal scroll bar.</paragraph>
+<section id="howtoget">
+    <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+    <paragraph role="paragraph" id="par_id261686502559749">Choose <menuitem>View - Scroll Bars - Horizontal Scroll Bar.</menuitem></paragraph>
+    <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+    <table id="tab_id511686502718692">
+        <tablerow>
+            <tablecell>
+                <paragraph id="par_id351686502718692" role="paragraph">
+                    <image src="cmd/lc_hscrollbar.svg" id="img_id481686502718693" width="1cm"  height="1cm"><alt id="alt_id381686502718693">Icon Horizontal Scroll Bar</alt></image>
+                </paragraph>
+            </tablecell>
+            <tablecell>
+                <paragraph id="par_id151686502718694" role="paragraph">Horizontal Scroll Bar</paragraph>
+            </tablecell>
+        </tablerow>
+    </table>
+</section>
+
+<bookmark branch="hid/.uno:VScroll" id="bm_id751686502492664" localize="false"/>
+<h2 id="hd_id501686502229966">Vertical Scroll Bar</h2>
+<paragraph role="paragraph" id="par_id911686502266544">Display the vertical scroll bar.</paragraph>
+<section id="howtoget">
+    <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+    <paragraph role="paragraph" id="par_id71686502578972">Choose <menuitem>View - Scroll Bars - Vertical Scroll Bar.</menuitem></paragraph>
+    <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+    <table id="tab_id281686502618585">
+        <tablerow>
+            <tablecell>
+                <paragraph id="par_id341686502618585" role="paragraph">
+                    <image src="cmd/lc_scrollbar.svg" id="img_id471686502618586" width="1cm"  height="1cm"><alt id="alt_id601686502618586">Icon Vertical Scroll Bar</alt></image>
+                </paragraph>
+            </tablecell>
+            <tablecell>
+                <paragraph id="par_id321686502618587" role="paragraph">Vertical Scroll Bar</paragraph>
+            </tablecell>
+        </tablerow>
+    </table>
+</section>
+</body>
+</helpdocument>
diff --git a/source/text/shared/02/01171200.xhp b/source/text/shared/02/01171200.xhp
index a5fb9cfa73..2f9677ae13 100644
--- a/source/text/shared/02/01171200.xhp
+++ b/source/text/shared/02/01171200.xhp
@@ -27,30 +27,14 @@
 </history>
 </meta>
 <body><comment>UFI: removed help ids</comment>
-<h1 id="hd_id3150476">Display Grid</h1>
-<embed href="text/shared/optionen/01050100.xhp#rastersicht"/>
-<switch select="appl">
-<case select="DRAW">
-    <embed href="text/shared/optionen/01050100.xhp#rastertextdraw"/>
-</case>
-
-<case select="IMPRESS">
-    <embed href="text/shared/optionen/01050100.xhp#rastertext"/>
-</case>
-</switch>
-<section id="sydisplay_grid">
-<table id="tbl_id3149549">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153750" xml-lang="en-US">
-<image id="img_id3153049" src="cmd/lc_gridvisible.svg" width="1cm" height="1cm"><alt id="alt_id3153049" xml-lang="en-US">Icon Display Grid</alt></image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3155536" xml-lang="en-US">Display Grid</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<bookmark branch="hid/.uno:GridVisible" id="bm_id281686516796297" localize="false"/>
+<section id="displaygrid">
+    <h1 id="hd_id3150476"><link href="text/shared/02/01171200.xhp#display grid">Display Grid</link></h1>
+    <paragraph role="paragraph" id="par_id131686520802424">Enables or disables the grid.</paragraph>
+</section>
 
+<section id="howtoget">
+    <embed href="text/shared/00/00000004.xhp#displaygrid"/>
 </section>
 </body>
 </helpdocument>
diff --git a/source/text/shared/02/01171300.xhp b/source/text/shared/02/01171300.xhp
index 254f9e1b13..7cc576a8de 100644
--- a/source/text/shared/02/01171300.xhp
+++ b/source/text/shared/02/01171300.xhp
@@ -24,20 +24,15 @@
 </topic>
 </meta>
 <body>
-<h1 id="hd_id3151262"><link href="text/shared/02/01171300.xhp">Snap to Grid</link></h1>
+<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>
-<section id="sysnap_to_grid">
-<table id="tbl_id3154230">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3156027" xml-lang="en-US">
-<image id="img_id3157896" src="cmd/lc_griduse.svg" width="1cm" height="1cm"><alt id="alt_id3157896" xml-lang="en-US">Icon Snap to Grid</alt></image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3147834" xml-lang="en-US">Snap to Grid</paragraph>
-</tablecell>
-</tablerow>
-</table>
 </section>
+<paragraph id="par_idN10589" role="paragraph">Automatically aligns objects to vertical and horizontal grid lines.</paragraph>
+<section id="howtoget">
+    <embed href="text/shared/00/00000004.xhp#snaptogrid"/>
+</section>
+<paragraph role="paragraph" id="par_id321683472243875">To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC"><keycode>Option</keycode></caseinline><defaultinline><keycode>Alt</keycode></defaultinline></switchinline> key when you drag an object.</paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/shared/02/01171400.xhp b/source/text/shared/02/01171400.xhp
index 08b32dd008..664bc75f87 100644
--- a/source/text/shared/02/01171400.xhp
+++ b/source/text/shared/02/01171400.xhp
@@ -29,22 +29,59 @@
 <comment>UFI: removed help ids</comment>
 
 <section id="helplines_while_moving">
-
 <h1 id="hd_id3155599"><variable id="Helplines While Movingh1"><link href="text/shared/02/01171400.xhp">Helplines While Moving</link></variable></h1>
-<embed href="text/shared/optionen/01070100.xhp#verschieb"/>
-<section id="syhline">
-<table id="tbl_id3147143">
-  <tablerow>
-    <tablecell>
-            <paragraph id="par_id3149549" role="paragraph"> <image id="img_id3149760" src="cmd/lc_helplinesmove.svg" width="1cm" height="1cm"><alt id="alt_id3149760">Icon Helplines While Moving</alt></image></paragraph>
-    </tablecell>
-    <tablecell>
-      <paragraph id="par_id3153049" role="paragraph">Helplines While Moving</paragraph>
-    </tablecell>
-  </tablerow>
-</table>
+<paragraph role="paragraph" id="par_id951686521137933">Activates or deactivates the display of guides when moving an object.</paragraph>
 </section>
+
+<section id="howtoget">
+  <switch select="appl">
+    <case select="CALC"/>
+    <case select="MATH"/>
+    <case select="BASE"/>
+    <default>
+      <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+      <paragraph role="paragraph" id="par_id501686521465917">Choose <menuitem>View - Grid and Helplines - Helplines While Moving</menuitem>.</paragraph>
+    </default>
+  </switch>
+  <switch select="appl">
+    <case select="WRITER"/>
+    <case select="CALC"/>
+    <case select="MATH"/>
+    <case select="BASE"/>
+    <default>
+      <embed href="text/shared/00/00000004.xhp#from_context"/>
+      <paragraph role="paragraph" id="par_id541686521522734"><menuitem>Grid and Helplines - Helplines While Moving</menuitem>.</paragraph>
+    </default>
+  </switch>
+  <switch select="appl">
+    <case select="WRITER">
+      <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+      <paragraph role="paragraph" id="par_id421686522333185">Choose <menuitem>View - Helplines While Moving</menuitem>.</paragraph>
+    </case>
+    <case select="CALC"/>
+    <case select="MATH"/>
+    <case select="BASE"/>
+    <default>
+      <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+      <paragraph role="paragraph" id="par_id371686522440108">Choose <menuitem>Home - Helplines While Moving</menuitem>.</paragraph>
+    </default>
+  </switch>
+
+  <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+  <section id="syhline">
+    <table id="tbl_id3147143">
+      <tablerow>
+        <tablecell>
+          <paragraph id="par_id3149549" role="paragraph"> <image id="img_id3149760" src="cmd/lc_helplinesmove.svg" width="1cm" height="1cm"><alt id="alt_id3149760">Icon Helplines While Moving</alt></image></paragraph>
+        </tablecell>
+        <tablecell>
+          <paragraph id="par_id3153049" role="paragraph">Helplines While Moving</paragraph>
+        </tablecell>
+      </tablerow>
+    </table>
+  </section>
 </section>
+
 <embed href="text/shared/optionen/01070100.xhp#vertext"/>
 </body>
 </helpdocument>
diff --git a/source/text/shared/02/gridtofront.xhp b/source/text/shared/02/gridtofront.xhp
new file mode 100644
index 0000000000..ad2b59e079
--- /dev/null
+++ b/source/text/shared/02/gridtofront.xhp
@@ -0,0 +1,33 @@
+<?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/.
+    *
+    -->
+
+    <meta>
+        <topic id="textshared02gridtofront" indexer="include" status="PUBLISH">
+        <title id="tit">Grid to Front</title>
+        <filename>/text/shared/02/gridtofront.xhp</filename>
+    </topic>
+</meta>
+<body>
+<bookmark branch="hid/.uno:GridFront" id="bm_id561686516686816" localize="false"/>
+<section id="grid2front">
+    <h1 id="hd_id241686523218429"><variable id="h1"><link href="text/shared/02/gridtofront.xhp">Grid to Front</link></variable></h1>
+    <paragraph id="par_idN105CD" role="paragraph"><ahelp hid=".">Displays the grid lines in front of the objects on the slide or page.</ahelp></paragraph>
+</section>
+
+<section id="howtoget">
+    <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+    <paragraph role="paragraph" id="par_id321686515859023">Choose <menuitem>View - Grid and Helplines - Grid to Front</menuitem>.</paragraph>
+    <embed href="text/shared/00/00000004.xhp#from_context"/>
+    <paragraph role="paragraph" id="par_id51686515989707"><menuitem>Grid and Helplines - Grid to Front</menuitem>.</paragraph>
+</section>
+
+</body>
+</helpdocument>
diff --git a/source/text/simpress/main0103.xhp b/source/text/simpress/main0103.xhp
index ece81b8fa2..613bda3d49 100644
--- a/source/text/simpress/main0103.xhp
+++ b/source/text/simpress/main0103.xhp
@@ -45,7 +45,7 @@
 <embed href="text/shared/01/03060000.xhp#status_bar"/>
 <embed href="text/simpress/01/03060000.xhp#rulers"/>
 <embed href="text/simpress/01/slidesorter.xhp#page_slide_pane"/>
-<embed href="text/shared/01/grid.xhp#grid"/>
+<embed href="text/shared/01/grid_and_helplines.xhp#grid_and_help_lines"/>
 <embed href="text/shared/01/guides.xhp#snap_lines"/>
 
 <h2 id="hd_id102720151244263489">Object Moving Helplines</h2>
diff --git a/source/text/simpress/main0202.xhp b/source/text/simpress/main0202.xhp
index b145b6ed24..79cba1bfb6 100644
--- a/source/text/simpress/main0202.xhp
+++ b/source/text/simpress/main0202.xhp
@@ -78,8 +78,9 @@
 <embed href="text/shared/02/01230000.xhp#stylist"/>
 <embed href="text/shared/02/01230000.xhp#systylist"/>
 
-<embed href="text/shared/01/grid.xhp#DisplayGrid"/>
-<embed href="text/shared/01/grid.xhp#Snap2Grid"/>
+<embed href="text/shared/02/01171200.xhp#displaygrid"/>
+
+<embed href="text/shared/02/01171300.xhp#snap2grid"/>
 
 <embed href="text/shared/02/01171400.xhp#helplines_while_moving"/>
 
diff --git a/source/text/swriter/main0103.xhp b/source/text/swriter/main0103.xhp
index ba80f62424..f553cc05d2 100644
--- a/source/text/swriter/main0103.xhp
+++ b/source/text/swriter/main0103.xhp
@@ -42,8 +42,7 @@
 <embed href="text/shared/01/03060000.xhp#status_bar"/>
 <embed href="text/swriter/01/03050000.xhp#rulers"/>
 
-<h2 id="hd_id102720150854015048">Scrollbars</h2>
-<paragraph id="par_id102720150854017277" role="paragraph" xml-lang="en-US">Show or hide the horizontal and vertical scroll bars that are used to change the viewable area of a document that doesn't fit within the window.</paragraph>
+<embed href="text/shared/01/scrollbars.xhp#scrollbars"/>
 
 <embed href="text/shared/01/grid_and_helplines.xhp#grid_and_help_lines"/>
 <embed href="text/swriter/01/03100000.xhp#nonprinting_chars"/>