update help for "View" menu for Draw and resolves: tdf#131358

( sdraw/main0103.xhp )
1. Reorder controls to correspond to order in View menu
2. Update label: "Master Page" -> "Master"
3. Replace "Grid" embed  with "Grid and Helplines" embed.
4. Add <comments> indicating where additional controls need to be added.
(will be removed as these are added in)
5. Update to: <h1>,<h2>

( text/sdraw/main0213.xhp )
1. update "Snap to Snap Lines"-> "Snap to Snap Guides"
2. add <section>s to embed into View - Snap Guides submenu (guides.xhp)
because ordering on toolbar is different from ordering in submenu.
3. update to: <h1>,<h2>

( text/shared/01/grid_and_helplines.xhp )
1. change embeds from shared/01/grid.xhp to correspond to submenu.
2. update to <h1>

( text/shared/01/grid.xhp )
1. Add and update section to be embedded in grid_and_helplines.xhp
(the old section name was only embedded in grid_and_helplines.xhp)
2. update to: <h1>,<h2>

( text/shared/01/guides.xhp )
1. Update all:  "Snap Lines" --> "Snap Guides"
2. Remove Control and description for "Snap to Snap Lines"
3. Add appl-switch for "slide" (Impress) or "page" (Draw).
4. Embed sections from (sdraw/main0213.xhp) for other controls.

( simpress/01/slidesorter.xhp )
update to: <h1>

Change-Id: If1bc4023a4d677707ebee9fd2c917aae68e717b1
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105356
Reviewed-by: Seth Chaiklin <sdc.blanco@youmail.dk>
Tested-by: Jenkins

6 files changed, 57 insertions, 61 deletions

diff --git a/source/text/sdraw/main0103.xhp b/source/text/sdraw/main0103.xhp
index 528aba07cd..c4618a48c0 100644
--- a/source/text/sdraw/main0103.xhp
+++ b/source/text/sdraw/main0103.xhp
@@ -20,7 +20,7 @@
 
 <meta>
   <topic id="textsdrawmain0103xml" indexer="include">
-    <title id="tit" xml-lang="en-US">View</title>
+    <title id="tit" xml-lang="en-US">View (menu in Draw)</title>
     <filename>/text/sdraw/main0103.xhp</filename>
   </topic>
 </meta>
@@ -30,25 +30,26 @@
 
 <section id="view">
 
-<paragraph id="hd_id3152576" role="heading" level="1" xml-lang="en-US"><link href="text/sdraw/main0103.xhp" name="View">View</link></paragraph>
+<h1 id="hd_id3152576" xml-lang="en-US"><link href="text/sdraw/main0103.xhp" name="View">View</link></h1>
 <paragraph id="par_id3159155" role="paragraph" xml-lang="en-US">Sets the display properties of Draw documents.</paragraph>
 </section>
 
-<paragraph id="par_idN105AB" role="heading" level="2" xml-lang="en-US">Normal</paragraph>
+<h2 id="par_idN105AB" xml-lang="en-US">Normal</h2>
 <paragraph id="par_idN105AF" role="paragraph" xml-lang="en-US">Switch to normal view of the page.</paragraph>
-
-<paragraph id="par_idN105B2" role="heading" level="2" xml-lang="en-US">Master Slide</paragraph>
-<paragraph id="par_idN105B6" role="paragraph" xml-lang="en-US">Switch to the master slide view.</paragraph>
-<embed href="text/simpress/01/03180000.xhp#color_grayscale"/>
-<embed href="text/simpress/01/slidesorter.xhp#page_slide_pane"/>
+<h2 id="par_idN105B2" xml-lang="en-US">Master</h2>
+<paragraph id="par_idN105B6" role="paragraph" xml-lang="en-US">Switch to the master view.</paragraph>
+<comment>User Interface and Toolbars needed here</comment>
 <embed href="text/shared/01/03060000.xhp#status_bar"/>
+<embed href="text/simpress/01/slidesorter.xhp#page_slide_pane"/>
 <embed href="text/simpress/01/03060000.xhp#rulers"/>
-<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"/>
+<comment>Comments needed here</comment>
+<embed href="text/simpress/01/03180000.xhp#color_grayscale"/>
+<comment>Sidebar/ Styles / Gallery needed here</comment>
 <embed href="text/simpress/01/02110000.xhp#navigator"/>
-
-<paragraph id="hd_id3149666" role="heading" level="2" xml-lang="en-US"><link href="text/shared/01/03010000.xhp" name="Zoom">Zoom</link></paragraph>
+<comment>Color Bar / Shift controls needed here</comment>
+<h2 id="hd_id3149666" xml-lang="en-US"><link href="text/shared/01/03010000.xhp" name="Zoom">Zoom</link></h2>
 <embed href="text/shared/01/03010000.xhp#zoom_text"/>
 </body>
-
 </helpdocument>
diff --git a/source/text/sdraw/main0213.xhp b/source/text/sdraw/main0213.xhp
index 6eae5fb2cc..5093d23f74 100644
--- a/source/text/sdraw/main0213.xhp
+++ b/source/text/sdraw/main0213.xhp
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -20,8 +18,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-
-		<helpdocument version="1.0">
 <meta>
 <topic id="textsdrawmain0213xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Options Bar</title>
@@ -30,40 +26,46 @@
 </meta>
 <body>
 <section id="optionsbar">
-<paragraph role="heading" id="hd_id3150793" xml-lang="en-US" level="1"><link href="text/sdraw/main0213.xhp" name="Options Bar">Options Bar</link></paragraph>
+<h1 id="hd_id3150793" xml-lang="en-US"><link href="text/sdraw/main0213.xhp" name="Options Bar">Options Bar</link></h1>
 <paragraph role="paragraph" id="par_id3154685" xml-lang="en-US">The <emph>Options</emph> bar can be displayed by choosing <emph>View - Toolbars - Options</emph>.</paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/simpress/00/00000403.xhp#option"/>
 </section><comment>UFI: changed some links, see #i52549</comment><embed href="text/simpress/02/13020000.xhp#drehmodus"/>
 <embed href="text/simpress/02/13020000.xhp#sydreh"/>
-<paragraph role="heading" id="hd_id3145251" xml-lang="en-US" level="2"><link href="text/shared/02/01171200.xhp" name="Display Grid">Display Grid</link></paragraph>
+<h2 id="hd_id3145251" xml-lang="en-US" ><link href="text/shared/02/01171200.xhp" name="Display Grid">Display Grid</link></h2>
 <embed href="text/shared/optionen/01050100.xhp#rastersicht"/>
 <embed href="text/shared/02/01171200.xhp#syrastsicht"/>
 <embed href="text/simpress/02/13050000.xhp#hilfslinsicht"/>
 <embed href="text/simpress/02/13050000.xhp#hilfsicht"/>
-<paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="2"><link href="text/shared/02/01171400.xhp" name="Helplines While Moving">Helplines While Moving</link></paragraph>
+<h2 id="hd_id3149018" xml-lang="en-US"><link href="text/shared/02/01171400.xhp" name="Helplines While Moving">Helplines While Moving</link></h2>
 <embed href="text/shared/optionen/01070100.xhp#verschieb"/>
 <embed href="text/shared/02/01171400.xhp#syhline"/>
-<paragraph role="heading" id="hd_id3147338" xml-lang="en-US" level="2"><link href="text/shared/02/01171300.xhp" name="Snap to Grid">Snap to Grid</link></paragraph>
+<section id="Snap_to_Grid_and_Guides">
+<h2 id="hd_id3147338" xml-lang="en-US"><link href="text/shared/02/01171300.xhp" name="Snap to Grid">Snap to Grid</link></h2>
 <embed href="text/shared/optionen/01050100.xhp#rasterfang"/>
 <embed href="text/shared/02/01171300.xhp#syrafang"/>
-<paragraph role="heading" id="hd_id3146313" xml-lang="en-US" level="2"><link href="text/simpress/02/13140000.xhp" name="Snap to Snap Lines">Snap to Snap Lines</link></paragraph>
+<h2 id="hd_id3146313" xml-lang="en-US"><link href="text/simpress/02/13140000.xhp" name="Snap to Snap Lines">Snap to Snap Guides</link></h2>
 <embed href="text/shared/optionen/01070300.xhp#anlinie"/>
 <embed href="text/simpress/02/13140000.xhp#syanline"/>
-<paragraph role="heading" id="hd_id3155111" xml-lang="en-US" level="2"><link href="text/simpress/02/13150000.xhp" name="Snap to Page Margins">Snap to Page Margins</link></paragraph>
+</section>
+<section id="Snap_to_Page">
+<h2 id="hd_id3155111" xml-lang="en-US"><link href="text/simpress/02/13150000.xhp" name="Snap to Page Margins">Snap to Page Margins</link></h2>
 <embed href="text/shared/optionen/01070300.xhp#seitenrand"/>
 <embed href="text/simpress/02/13150000.xhp#sysfang"/>
-<paragraph role="heading" id="hd_id3150343" xml-lang="en-US" level="2"><link href="text/simpress/02/13160000.xhp" name="Snap to Object Border">Snap to Object Border</link></paragraph>
+</section>
+<section id="Snap_to_Border_and_Points">
+<h2 id="hd_id3150343" xml-lang="en-US"><link href="text/simpress/02/13160000.xhp" name="Snap to Object Border">Snap to Object Border</link></h2>
 <embed href="text/shared/optionen/01070300.xhp#rahmen"/>
 <embed href="text/simpress/02/13160000.xhp#sysobfang"/>
-<paragraph role="heading" id="hd_id3150368" xml-lang="en-US" level="2"><link href="text/simpress/02/13170000.xhp" name="Snap to Object Points">Snap to Object Points</link></paragraph>
+<h2 id="hd_id3150368" xml-lang="en-US"><link href="text/simpress/02/13170000.xhp" name="Snap to Object Points">Snap to Object Points</link></h2>
 <embed href="text/shared/optionen/01070300.xhp#opunkte"/>
 <embed href="text/simpress/02/13170000.xhp#sysobpunkt"/>
-<paragraph role="heading" id="hd_id3146980" xml-lang="en-US" level="2"><link href="text/simpress/02/13180000.xhp" name="Allow Quick Editing">Allow Quick Editing</link></paragraph>
+</section>
+<h2 id="hd_id3146980" xml-lang="en-US"><link href="text/simpress/02/13180000.xhp" name="Allow Quick Editing">Allow Quick Editing</link></h2>
 <embed href="text/shared/optionen/01070500.xhp#schnellbearb"/>
 <embed href="text/simpress/02/13180000.xhp#syschnllzu"/>
-<paragraph role="heading" id="hd_id3148870" xml-lang="en-US" level="2"><link href="text/simpress/02/13190000.xhp" name="Select Text Area Only">Select Text Area Only</link></paragraph>
+<h2 id="hd_id3148870" xml-lang="en-US"><link href="text/simpress/02/13190000.xhp" name="Select Text Area Only">Select Text Area Only</link></h2>
 <embed href="text/shared/optionen/01070500.xhp#textbereich"/>
 <embed href="text/simpress/02/13190000.xhp#synurtext"/>
 <embed href="text/simpress/02/13060000.xhp#txtdoppel"/>
diff --git a/source/text/shared/01/grid.xhp b/source/text/shared/01/grid.xhp
index 5ab02c0345..9786287511 100644
--- a/source/text/shared/01/grid.xhp
+++ b/source/text/shared/01/grid.xhp
@@ -27,7 +27,6 @@
 
 <body>
 
-
 <section id="grid">
 <bookmark xml-lang="en-US" branch="index" id="bm_id4263435">
   <bookmark_value>grids;display options (Impress/Draw)</bookmark_value>
@@ -35,7 +34,7 @@
 
 <bookmark xml-lang="en-US" branch="hid/.uno:GridMenu" id="bm_id9596240" localize="false"/>
 
-<paragraph id="par_idN10565" role="heading" level="1" xml-lang="en-US"><link href="text/shared/01/grid.xhp">Grid</link></paragraph>
+<h1 id="par_idN10565" xml-lang="en-US"><link href="text/shared/01/grid.xhp">Grid</link></h1>
 <paragraph id="par_id3147340" role="paragraph" xml-lang="en-US"><ahelp hid=".">Sets the display properties of a grid.</ahelp></paragraph>
 </section>
 
@@ -43,18 +42,20 @@
 <embed href="text/shared/00/00000403.xhp#grid"/>
 </section>
 
-<section id="DisplayandSnap">
-
-<paragraph id="par_idN1057E" role="heading" level="2" xml-lang="en-US">Display Grid</paragraph>
+<section id="DisplayGrid">
+<h2 id="par_idN1057E" xml-lang="en-US">Display Grid</h2>
 <paragraph id="par_idN10582" role="paragraph" xml-lang="en-US">Displays or hides grid lines that you can use to align objects such as graphics on a page.</paragraph>
+</section>
 
-<paragraph id="par_idN10585" role="heading" level="2" xml-lang="en-US">Snap to Grid</paragraph><comment>issue 112000 for new key</comment>
+<h2 id="par_idN10585" xml-lang="en-US">Snap to Grid</h2><comment>issue 112000 for new key</comment>
 <paragraph id="par_idN10589" role="paragraph" xml-lang="en-US">Automatically aligns objects to vertical and horizontal grid lines. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Option key
 </caseinline><defaultinline>Alt key</defaultinline></switchinline> when you drag an object.<comment>UFI: copied from shared\optionen\01050100.xhp</comment></paragraph>
-</section><comment>UFI removed GridFront help id</comment>
+<comment>UFI removed GridFront help id</comment>
 
-<paragraph id="par_idN105C9" role="heading" level="2" xml-lang="en-US">Grid to Front</paragraph>
+<section id="GridtoFront">
+<h2 id="par_idN105C9" xml-lang="en-US">Grid to Front</h2>
 <paragraph id="par_idN105CD" role="paragraph" xml-lang="en-US"><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" xml-lang="en-US">Set the grid color on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences
diff --git a/source/text/shared/01/grid_and_helplines.xhp b/source/text/shared/01/grid_and_helplines.xhp
index 3f99c12969..f50c18ebd0 100644
--- a/source/text/shared/01/grid_and_helplines.xhp
+++ b/source/text/shared/01/grid_and_helplines.xhp
@@ -26,16 +26,14 @@
 </meta>
 
 <body>
-
-
 <section id="grid_and_help_lines">
 <bookmark xml-lang="en-US" branch="hid/.uno:xxxx" id="bm_id03302017025726316" localize="false"/>
 
-<paragraph id="hd_id033020170255198878" role="heading" level="1" xml-lang="en-US"><link href="text/shared/01/grid_and_helplines.xhp">Grid and Help Lines</link></paragraph>
+<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>
 </section>
-<embed href="text/shared/01/grid.xhp#DisplayandSnap"/>
+<embed href="text/shared/01/grid.xhp#DisplayGrid"/>
+<embed href="text/shared/01/grid.xhp#GridtoFront"/>
 <embed href="text/shared/02/01171400.xhp#helplines_while_moving"/>
 </body>
-
 </helpdocument>
\ No newline at end of file
diff --git a/source/text/shared/01/guides.xhp b/source/text/shared/01/guides.xhp
index 9f795f79d5..4b7fb01bf8 100644
--- a/source/text/shared/01/guides.xhp
+++ b/source/text/shared/01/guides.xhp
@@ -20,14 +20,13 @@
 
 <meta>
   <topic id="textshared01guidesxml" indexer="include" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">Snap Lines</title>
+    <title id="tit" xml-lang="en-US">Snap Guides</title>
     <filename>/text/shared/01/guides.xhp</filename>
   </topic>
 </meta>
 
 <body>
 
-
 <section id="snap_lines">
 
 <bookmark xml-lang="en-US" branch="index" id="bm_id1441999">
@@ -36,23 +35,23 @@
 
 <bookmark xml-lang="en-US" branch="hid/.uno:SnapLinesMenu" id="bm_id2510147" localize="false"/>
 
-<paragraph id="par_idN10562" role="heading" level="1" xml-lang="en-US"><link href="text/shared/01/guides.xhp">Snap Lines</link></paragraph>
-<paragraph id="par_id3146313" role="paragraph" xml-lang="en-US"><ahelp hid=".">Specifies the display options for snap lines.</ahelp></paragraph>
+<h1 id="par_idN10562" xml-lang="en-US"><link href="text/shared/01/guides.xhp">Snap Guides</link></h1>
+<paragraph id="par_id3146313" role="paragraph" xml-lang="en-US"><ahelp hid=".">Specifies the display options for snap guides.</ahelp></paragraph>
 </section>
 
 <section id="howtoget">
 <embed href="text/shared/00/00000403.xhp#guides"/>
 </section>
 
-<paragraph id="par_idN1057B" role="heading" level="2" xml-lang="en-US">Display Snap Lines</paragraph>
-<paragraph id="par_idN1057F" role="paragraph" xml-lang="en-US">Displays or hides snap lines that you can use to align objects on a page.</paragraph>
+<h2 id="par_idN1057B" xml-lang="en-US">Display Snap Guides</h2>
+<paragraph id="par_idN1057F" role="paragraph" xml-lang="en-US">Displays or hides snap guides that you can use to align objects on a page.</paragraph>
 
-<paragraph id="par_idN10582" role="heading" level="2" xml-lang="en-US">Snap to Snap Lines</paragraph><comment>changed in BetterDefaults_Gridhandling issue 112000</comment>
-<paragraph id="par_idN10586" role="paragraph" xml-lang="en-US">Automatically aligns objects to vertical and horizontal snap lines. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Option key
-</caseinline><defaultinline>Alt key </defaultinline></switchinline>when you drag an object.<comment>UFI: test it! copied from shared\01\grid.xhp</comment></paragraph>
 
-<paragraph id="par_idN105C6" role="heading" level="2" xml-lang="en-US">Snap Lines to Front</paragraph>
-<paragraph id="par_idN105CA" role="paragraph" xml-lang="en-US"><ahelp hid=".">Displays the snap lines in front of the objects on the slide or page.</ahelp></paragraph>
+<h2 id="par_idN105C6" xml-lang="en-US">Snap Guides to Front</h2>
+<paragraph id="par_idN105CA" role="paragraph" xml-lang="en-US"><ahelp hid=".">Displays the snap guides in front of the objects on the <switchinline select="appl"><caseinline  select="DRAW">page</caseinline><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline>.</ahelp></paragraph>
+<embed href="text/sdraw/main0213.xhp#Snap_to_Grid_and_Guides"/>
+<embed href="text/sdraw/main0213.xhp#Snap_to_Border_and_Points"/>
+<embed href="text/sdraw/main0213.xhp#Snap_to_Page"/>
 </body>
 
 </helpdocument>
diff --git a/source/text/simpress/01/slidesorter.xhp b/source/text/simpress/01/slidesorter.xhp
index 095113c290..9931f5ede5 100644
--- a/source/text/simpress/01/slidesorter.xhp
+++ b/source/text/simpress/01/slidesorter.xhp
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,8 +17,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-	
-<helpdocument version="1.0">
+
 <meta>
 <topic id="textsimpress01slidesorterxml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Page/Slide Pane</title>
@@ -33,12 +31,9 @@
 <section id="page_slide_pane">
 <bookmark xml-lang="en-US" branch="hid/.uno:LeftPaneImpress" id="bm_id126346" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:LeftPaneDraw" id="bm_id1274147" localize="false"/>
-<paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="1"><link href="text/simpress/01/slidesorter.xhp"><switchinline select="appl"><caseinline select="DRAW">Page 
-</caseinline><defaultinline>Slide </defaultinline></switchinline>Pane</link></paragraph>
-<paragraph role="paragraph" id="par_idN10554" xml-lang="en-US"><ahelp hid=".">Switches the <switchinline select="appl"><caseinline select="DRAW">Page 
-</caseinline><defaultinline>Slide </defaultinline></switchinline>Pane on and off.</ahelp></paragraph>
+<h1 id="par_idN10544" xml-lang="en-US"><link href="text/simpress/01/slidesorter.xhp"><switchinline select="appl"><caseinline select="DRAW">Page </caseinline><defaultinline>Slide </defaultinline></switchinline>Pane</link></h1>
+<paragraph role="paragraph" id="par_idN10554" xml-lang="en-US"><ahelp hid=".">Switches the <switchinline select="appl"><caseinline select="DRAW">Page </caseinline><defaultinline>Slide </defaultinline></switchinline>Pane on and off.</ahelp></paragraph>
 </section>
-<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US">You can use the <switchinline select="appl"><caseinline select="DRAW">Page 
-</caseinline><defaultinline>Slide </defaultinline></switchinline> Pane to add, to rename, to delete, and to arrange slides or pages in Impress and Draw.</paragraph>
+<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US">You can use the <switchinline select="appl"><caseinline select="DRAW">Page </caseinline><defaultinline>Slide </defaultinline></switchinline> Pane to add, to rename, to delete, and to arrange slides or pages in Impress and Draw.</paragraph>
 </body>
 </helpdocument>