tdf#137084 Update writer View menu

part A - View of comment#18

Change-Id: I8ddfdc8799f499d4730b08e217b07baaa3799172
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/121036
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

8 files changed, 65 insertions, 18 deletions

diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk
index 05c173f556..a23f3136e0 100644
--- a/AllLangHelp_swriter.mk
+++ b/AllLangHelp_swriter.mk
@@ -200,6 +200,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
     helpcontent2/source/text/swriter/01/mm_seltab \
     helpcontent2/source/text/swriter/01/outlinecontent_visibility \
     helpcontent2/source/text/swriter/01/selection_mode \
+    helpcontent2/source/text/swriter/01/show_whitespace \
     helpcontent2/source/text/swriter/01/title_page \
     helpcontent2/source/text/swriter/01/watermark \
     helpcontent2/source/text/swriter/02/02110000 \
diff --git a/source/text/shared/00/00000403.xhp b/source/text/shared/00/00000403.xhp
index cf02a7576f..f12d290363 100644
--- a/source/text/shared/00/00000403.xhp
+++ b/source/text/shared/00/00000403.xhp
@@ -108,7 +108,7 @@
 
 </section>
 </section>
-<paragraph role="paragraph" id="par_idN1091B" xml-lang="en-US"><variable id="grid">Choose <menuitem>View - Grid and Helplines</menuitem> (Impress or Draw).</variable></paragraph>
+<paragraph role="paragraph" id="par_idN1091B" xml-lang="en-US"><variable id="grid">Choose <menuitem>View - Grid and Helplines</menuitem>.</variable></paragraph>
 <paragraph role="paragraph" id="par_idN1092E" xml-lang="en-US"><variable id="guides">Choose <menuitem>View - Snap Guides</menuitem> (Impress or Draw).</variable></paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/shared/01/02230200.xhp b/source/text/shared/01/02230200.xhp
index d9cd99ea58..f0190c268a 100644
--- a/source/text/shared/01/02230200.xhp
+++ b/source/text/shared/01/02230200.xhp
@@ -37,7 +37,7 @@
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/showchangesdialog/@@nowidget@@" id="bm_id3154349" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ShowChanges" id="bm_id3147240" localize="false"/>
 <section id="showchanges">
-<h1 id="hd_id3149988"><link href="text/shared/01/02230200.xhp" name="Show Changes">Show</link></h1>
+<h1 id="hd_id3149988"><link href="text/shared/01/02230200.xhp" name="Show Changes">Show Track Changes</link></h1>
 <paragraph role="paragraph" id="par_id3153323" xml-lang="en-US"><variable id="text"><ahelp hid=".">Shows or hides recorded changes.</ahelp>
 </variable></paragraph>
 </section>
diff --git a/source/text/shared/01/gallery.xhp b/source/text/shared/01/gallery.xhp
index d1ef40d285..9f3dd1d3b8 100644
--- a/source/text/shared/01/gallery.xhp
+++ b/source/text/shared/01/gallery.xhp
@@ -37,7 +37,7 @@
 <section id="stargallery">
 <bookmark xml-lang="en-US" branch="hid/.uno:Gallery" id="bm_id2975847" localize="false"/>
 
-<paragraph id="hd_id3153894" role="heading" level="1" xml-lang="en-US"><link href="text/shared/01/gallery.xhp" name="Gallery">Gallery</link></paragraph>
+<h1 id="hd_id3153894"><link href="text/shared/01/gallery.xhp" name="Gallery">Gallery</link></h1>
 <paragraph id="par_id3150789" role="paragraph" xml-lang="en-US"><variable id="media_gallery_text"><ahelp hid=".">Opens the Gallery deck of the Sidebar, where you can select images and audio clips to insert into your document.</ahelp></variable></paragraph>
 </section>
 </section>
@@ -55,11 +55,11 @@
 <embed href="text/shared/guide/dragdrop_fromgallery.xhp#dragdrop_fromgallery"/>
 <embed href="text/shared/guide/dragdrop_gallery.xhp#dragdrop_gallery"/>
 
-<paragraph id="hd_id3156113" role="heading" level="3" xml-lang="en-US">Adding a New File to the Gallery</paragraph>
+<h3 id="hd_id3156113">Adding a New File to the Gallery</h3>
 <paragraph id="par_id3153032" role="paragraph" xml-lang="en-US">To add a file to the <emph>Gallery</emph>, right-click a theme, choose <emph>Properties</emph>, click the <emph>Files</emph> tab, and then click <emph>Add</emph>. You can also click an object in the current document, hold, and then drag it to the <emph>Gallery</emph> window.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVX_HID_GALLERY_NEWTHEME" id="bm_id3154381" localize="false"/>
 
-<paragraph id="hd_id3145315" role="heading" level="2" xml-lang="en-US">New theme</paragraph>
+<h2 id="hd_id3145315">New theme</h2>
 <paragraph id="par_id3150275" role="paragraph" xml-lang="en-US"><ahelp hid="SVX_HID_GALLERY_NEWTHEME">Adds a new theme to the <emph>Gallery</emph> and lets you choose the files to include in the theme.</ahelp></paragraph>
 <paragraph id="par_id3159167" role="paragraph" xml-lang="en-US">To access the following commands, right-click a theme in the <emph>Gallery</emph>:</paragraph>
 <embed href="text/shared/00/00000010.xhp#delete"/>
@@ -67,11 +67,11 @@
 <embed href="text/shared/00/00000010.xhp#rename"/>
 <embed href="text/shared/00/00000010.xhp#update"/>
 
-<paragraph id="hd_id3154142" role="heading" level="2" xml-lang="en-US">Properties</paragraph>
+<h2 id="hd_id3154142">Properties</h2>
 <paragraph id="par_id3148990" role="paragraph" xml-lang="en-US">The <emph>Properties of (Theme)</emph> dialog contains the following tabs:</paragraph>
 <embed href="text/shared/00/01050000.xhp#general"/>
 
-<paragraph id="hd_id3151384" role="heading" level="2" xml-lang="en-US"><link href="text/shared/01/gallery_files.xhp" name="Files">Files</link></paragraph>
+<h2 id="hd_id3151384"><link href="text/shared/01/gallery_files.xhp" name="Files">Files</link></h2>
 <embed href="text/shared/01/gallery_files.xhp#stargallerymanager"/>
 <embed href="text/shared/00/00000010.xhp#insert"/>
 <embed href="text/shared/00/00000010.xhp#preview"/>
diff --git a/source/text/swriter/00/00000403.xhp b/source/text/swriter/00/00000403.xhp
index b1bd3f499e..efb861bb04 100644
--- a/source/text/swriter/00/00000403.xhp
+++ b/source/text/swriter/00/00000403.xhp
@@ -63,6 +63,23 @@
 
 </section>
 </section>
+<section id="show_whitespace">
+    <paragraph role="paragraph" id="par_id401629894593714">Choose <menuitem>View - Show Whitespace</menuitem>.</paragraph>
+   <table id="tab_id131629893774664">
+    <tablerow>
+        <tablecell>
+            <paragraph id="par_id291629893774665" role="paragraph">
+                <image src="cmd/lc_showwhitespace.svg" id="img_id221629893774666" width="1cm"  height="1cm"><alt xml-lang="en-US" id="alt_id141629893774667">Icon Show Whitespace </alt></image>
+            </paragraph>
+        </tablecell>
+        <tablecell>
+            <paragraph id="par_id311629893774668" role="paragraph" xml-lang="en-US">Show Whitespace</paragraph>
+        </tablecell>
+    </tablerow>
+</table>
+</section>
+
+
 
 <section id="webbrowser">
 <paragraph id="par_id3149712" role="paragraph" xml-lang="en-US">Choose <menuitem>View - Web</menuitem></paragraph>
diff --git a/source/text/swriter/01/03100000.xhp b/source/text/swriter/01/03100000.xhp
index 0b10781a4d..3ed45c16e4 100644
--- a/source/text/swriter/01/03100000.xhp
+++ b/source/text/swriter/01/03100000.xhp
@@ -31,7 +31,7 @@
 <section id="nonprinting_chars">
 <bookmark xml-lang="en-US" branch="hid/.uno:ControlCodes" id="bm_id9113552" localize="false"/>
 
-<paragraph id="hd_id3154507" role="heading" level="1" xml-lang="en-US"><link href="text/swriter/01/03100000.xhp" name="Formatting Marks">Formatting Marks</link></paragraph>
+<h1 id="hd_id3154507"><link href="text/swriter/01/03100000.xhp" name="Formatting Marks">Formatting Marks</link></h1>
 <paragraph id="par_id3154646" role="paragraph" xml-lang="en-US"><ahelp hid=".">Shows hidden formatting symbols in your text, such as paragraph marks, line breaks, tab stops, and spaces.</ahelp></paragraph>
 </section>
 
diff --git a/source/text/swriter/01/show_whitespace.xhp b/source/text/swriter/01/show_whitespace.xhp
new file mode 100644
index 0000000000..13fbb7e7ba
--- /dev/null
+++ b/source/text/swriter/01/show_whitespace.xhp
@@ -0,0 +1,28 @@
+<?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="show_whitespace" indexer="include" status="PUBLISH">
+    <title id="tit" xml-lang="en-US">Show Whitespace</title>
+    <filename>/text/swriter/01/show_whitespace.xhp</filename>
+  </topic>
+</meta>
+<body>
+<section id="show_whitespace_head">
+    <bookmark id="bm_id721629893531853" xml-lang="en-US" branch="hid/.uno:ShowWhitespace" localize="false"/>
+    <h1 id="hd_id11629893531856"><link href="text/swriter/01/show_whitespace.xhp" name="show_whitespace">Show Whitespace</link></h1>
+    <paragraph id="par_id102720150854012820" role="paragraph" xml-lang="en-US">Displays the document with the top and bottom margins, header and footer and a gap between pages. Uncheck to collapse all the elements above and display document in a contiguous page stream. Hiding whitespace is only possible in Single-page view.</paragraph>
+</section>
+<section id="howtoget">
+<embed href="text/swriter/00/00000403.xhp#show_whitespace"/>
+</section>
+</body>
+</helpdocument>
diff --git a/source/text/swriter/main0103.xhp b/source/text/swriter/main0103.xhp
index 2b5c029899..7fc44b8930 100644
--- a/source/text/swriter/main0103.xhp
+++ b/source/text/swriter/main0103.xhp
@@ -40,6 +40,7 @@
 
 <h2 id="par_id102720150703478401"><link href="text/swriter/01/03120000.xhp">Web</link></h2>
 <embed href="text/swriter/01/03120000.xhp#web_layout_text"/>
+<embed href="text/shared/01/notebook_bar.xhp#using_the_notebook_bar"/>
 <embed href="text/shared/02/19090000.xhp#htmlsource"/>
 <embed href="text/shared/01/03990000.xhp#toolbars"/>
 <embed href="text/shared/01/03060000.xhp#status_bar"/>
@@ -47,6 +48,9 @@
 
 <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/grid_and_helplines.xhp#grid_and_help_lines"/>
+<embed href="text/swriter/01/03100000.xhp#nonprinting_chars"/>
 <embed href="text/swriter/01/03070000.xhp#text_boundaries"/>
 
 <h2 id="par_idN10613">Table Boundaries</h2>
@@ -55,32 +59,29 @@
 <h2 id="hd_id102720150854011929">Images and Charts</h2>
 <paragraph id="par_id102720150854013292" role="paragraph" xml-lang="en-US">Show or hide graphical objects like images and charts within a document.</paragraph>
 
+<embed href="text/swriter/01/show_whitespace.xhp#show_whitespace_head"/>
+<embed href="text/shared/01/02230200.xhp#showchanges"/>
+
 <h2 id="hd_id102720150854019880">Comments</h2>
 <paragraph id="par_id102720150854014989" role="paragraph" xml-lang="en-US">Show or hide a document's comments and replies to them.</paragraph>
+
 <h2 id="hd_id981573492083329">Resolved comments</h2>
 <paragraph role="paragraph" id="par_id331573492076499">Show or hide <link href="text/shared/01/04050000.xhp#resolvecomments" name="resolve comments">resolved comments</link>.</paragraph>
-<embed href="text/swriter/01/03100000.xhp#nonprinting_chars"/>
-<embed href="text/shared/01/grid_and_helplines.xhp#grid_and_help_lines"/>
-
-<h2 id="hd_id102720150854018740">Show Whitespace</h2>
-<paragraph id="par_id102720150854012820" role="paragraph" xml-lang="en-US">Displays the document with the top and bottom margins, header and footer and a gap between pages. Uncheck to collapse all the elements above and display document in a contiguous page stream. Hiding whitespace is only possible in Single-page view.</paragraph>
 
-<h2 id="hd_id03302017034826145">Track Changes</h2>
-<embed href="text/shared/01/02230200.xhp#showchanges"/>
 <embed href="text/swriter/01/03080000.xhp#field_shadings"/>
 <embed href="text/swriter/01/03090000.xhp#field_names"/>
 <embed href="text/swriter/01/03140000.xhp#hidden_paragraphs"/>
 <embed href="text/shared/01/menu_view_sidebar.xhp#sidebar"/>
 <embed href="text/swriter/01/05140000.xhp#styles_and_formatting"/>
 
-<h2 id="hd_id102720150908397549"><link href="text/shared/01/gallery.xhp">Gallery</link></h2>
-<embed href="text/shared/01/gallery.xhp#media_gallery_text"/>
+<embed href="text/shared/01/gallery.xhp#media_gallery"/>
+
 <embed href="text/swriter/01/02110000.xhp#navigator"/>
 <embed href="text/shared/01/04180100.xhp#data_sources"/>
 <embed href="text/shared/01/03110000.xhp#full_screen"/>
 
 <h2 id="hd_id3147265"><link href="text/shared/01/03010000.xhp" name="Zoom">Zoom</link></h2>
 <embed href="text/shared/01/03010000.xhp#zoom_text"/>
-</body>
 
+</body>
 </helpdocument>