[Libreoffice-commits] help.git: 2 commits - AllLangHelp_sdraw.mk AllLangHelp_shared.mk AllLangHelp_simpress.mk Package_html_media.mk source/auxiliary source/media source/text

Olivier Hallot (via logerrit) logerrit at kemper.freedesktop.org
Sun Aug 18 22:22:34 UTC 2019


 AllLangHelp_sdraw.mk                                    |    8 
 AllLangHelp_shared.mk                                   |    2 
 AllLangHelp_simpress.mk                                 |    2 
 Package_html_media.mk                                   |    6 
 source/auxiliary/sdraw.tree                             |    9 
 source/media/helpimg/sc_cell_with_comment_displayed.png |binary
 source/media/helpimg/sd_drawing_with_comment.png        |binary
 source/media/helpimg/si_presentation_with_comment.png   |binary
 source/media/helpimg/sw_text_with_comment.png           |binary
 source/text/sdraw/00/page_menu.xhp                      |   11 
 source/text/sdraw/01/delete_page.xhp                    |   30 +
 source/text/sdraw/01/duplicate_page.xhp                 |   28 +
 source/text/sdraw/01/insert_layer.xhp                   |    5 
 source/text/sdraw/01/modify_layer.xhp                   |    2 
 source/text/sdraw/01/navigate_page.xhp                  |   28 +
 source/text/sdraw/01/new_page.xhp                       |    7 
 source/text/sdraw/01/rename_page.xhp                    |   31 ++
 source/text/sdraw/main0100.xhp                          |   12 
 source/text/sdraw/main_format.xhp                       |    4 
 source/text/sdraw/main_insert.xhp                       |   47 +--
 source/text/sdraw/main_page.xhp                         |   31 +-
 source/text/sdraw/main_shape.xhp                        |   25 +
 source/text/shared/00/00000404.xhp                      |   58 +--
 source/text/shared/01/04050000.xhp                      |  245 ++++++++++------
 source/text/shared/02/01170000.xhp                      |    8 
 source/text/shared/guide/fontwork.xhp                   |    2 
 source/text/shared/menu/insert_form_control.xhp         |   64 +---
 source/text/shared/menu/save_image.xhp                  |   37 ++
 source/text/shared/menu/set_image_background.xhp        |   36 ++
 source/text/simpress/01/02110000.xhp                    |  123 ++++----
 source/text/simpress/01/04110000.xhp                    |   11 
 source/text/simpress/01/04110100.xhp                    |    4 
 32 files changed, 608 insertions(+), 268 deletions(-)

New commits:
commit 6570689918de8fa9185c496808681b4612906164
Author:     Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Sun Aug 18 17:44:45 2019 -0300
Commit:     Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Mon Aug 19 00:22:14 2019 +0200

    Update Draw menus and Contents tree (part)
    
    Change-Id: I556a2cafdd66fc425aa67f821c1a5b676ef22c81
    Reviewed-on: https://gerrit.libreoffice.org/77677
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/AllLangHelp_sdraw.mk b/AllLangHelp_sdraw.mk
index 0df12b7ac..877ff7489 100644
--- a/AllLangHelp_sdraw.mk
+++ b/AllLangHelp_sdraw.mk
@@ -21,8 +21,14 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdraw,\
     helpcontent2/source/text/sdraw/main_page \
     helpcontent2/source/text/sdraw/00/00000004 \
     helpcontent2/source/text/sdraw/00/page_menu \
+    helpcontent2/source/text/sdraw/01/delete_page \
+    helpcontent2/source/text/sdraw/01/duplicate_page \
+    helpcontent2/source/text/sdraw/01/insert_layer \
+    helpcontent2/source/text/sdraw/01/modify_layer \
     helpcontent2/source/text/sdraw/01/new_page \
+    helpcontent2/source/text/sdraw/01/navigate_page \
     helpcontent2/source/text/sdraw/01/page_properties \
+    helpcontent2/source/text/sdraw/01/rename_page \
     helpcontent2/source/text/sdraw/04/01020000 \
     helpcontent2/source/text/sdraw/guide/align_arrange \
     helpcontent2/source/text/sdraw/guide/color_define \
@@ -51,6 +57,8 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdraw,\
     helpcontent2/source/text/sdraw/main0103 \
     helpcontent2/source/text/sdraw/main_insert \
     helpcontent2/source/text/sdraw/main_format \
+    helpcontent2/source/text/sdraw/main_page \
+    helpcontent2/source/text/sdraw/main_shape \
     helpcontent2/source/text/sdraw/main_tools \
     helpcontent2/source/text/sdraw/main0200 \
     helpcontent2/source/text/sdraw/main0202 \
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index dcc2d4c21..46934ccb5 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -740,6 +740,8 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     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 \
+    helpcontent2/source/text/shared/menu/set_image_background \
     helpcontent2/source/text/shared/need_help \
     helpcontent2/source/text/shared/optionen/01000000 \
     helpcontent2/source/text/shared/optionen/01010000 \
diff --git a/AllLangHelp_simpress.mk b/AllLangHelp_simpress.mk
index 24de6ae0d..a80deaf34 100644
--- a/AllLangHelp_simpress.mk
+++ b/AllLangHelp_simpress.mk
@@ -56,7 +56,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
     helpcontent2/source/text/simpress/01/03152000 \
     helpcontent2/source/text/simpress/01/03180000 \
     helpcontent2/source/text/simpress/01/new_slide \
-    helpcontent2/source/text/simpress/01/04020000 \
     helpcontent2/source/text/simpress/01/04030000 \
     helpcontent2/source/text/simpress/01/04030000m \
     helpcontent2/source/text/simpress/01/04030100 \
@@ -83,7 +82,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
     helpcontent2/source/text/simpress/01/05120100 \
     helpcontent2/source/text/simpress/01/05120500m \
     helpcontent2/source/text/simpress/01/05130000 \
-    helpcontent2/source/text/simpress/01/05140000 \
     helpcontent2/source/text/simpress/01/05150000 \
     helpcontent2/source/text/simpress/01/05170000 \
     helpcontent2/source/text/simpress/01/05250000 \
diff --git a/source/auxiliary/sdraw.tree b/source/auxiliary/sdraw.tree
index 5c33b999c..afc2c2b11 100644
--- a/source/auxiliary/sdraw.tree
+++ b/source/auxiliary/sdraw.tree
@@ -20,12 +20,13 @@
                  <node id="11020201" title="Menus">
                      <topic id="sdraw/text/sdraw/main0100.xhp">Menus</topic>
                      <topic id="sdraw/text/sdraw/main0101.xhp">File</topic>
-                     <topic id="sdraw/text/sdraw/main0102.xhp">Edit</topic>
+                     <topic id="sdraw/text/sdraw/main_edit.xhp">Edit</topic>
                      <topic id="sdraw/text/sdraw/main0103.xhp">View</topic>
-                     <topic id="sdraw/text/sdraw/main0104.xhp">Insert</topic>
-                     <topic id="sdraw/text/sdraw/main0105.xhp">Format</topic>
+                     <topic id="sdraw/text/sdraw/main_insert.xhp">Insert</topic>
+                     <topic id="sdraw/text/sdraw/main_format.xhp">Format</topic>
+                     <topic id="sdraw/text/sdraw/main_page.xhp">Page</topic>
                      <topic id="sdraw/text/sdraw/main_shape.xhp">Shape</topic>
-                     <topic id="sdraw/text/sdraw/main0106.xhp">Tools</topic>
+                     <topic id="sdraw/text/sdraw/main_tools.xhp">Tools</topic>
                      <topic id="simpress/text/simpress/main0107.xhp">Window</topic>
                      <topic id="shared/text/shared/main0108.xhp">Help</topic>
                  </node>
diff --git a/source/text/sdraw/00/page_menu.xhp b/source/text/sdraw/00/page_menu.xhp
index 5a006d5f2..f04fa95c1 100644
--- a/source/text/sdraw/00/page_menu.xhp
+++ b/source/text/sdraw/00/page_menu.xhp
@@ -18,9 +18,9 @@
 -->
 <helpdocument version="1.0">
   <meta>
-    <topic id="textsimpress00pagemenuxml" indexer="exclude" status="PUBLISH">
+    <topic id="textsdraw00pagemenuxml" indexer="exclude" status="PUBLISH">
       <title id="tit" xml-lang="en-US">Page Menu</title>
-      <filename>/text/simpress/00/page_menu.xhp</filename>
+      <filename>/text/sdraw/00/page_menu.xhp</filename>
     </topic>
   </meta>
   <body>
@@ -48,5 +48,12 @@
         </table>
       </section>
     </section>
+    <paragraph role="paragraph" id="par_id231566134395223"><variable id="menupagerename">Choose <menuitem>Page - Rename Page</menuitem></variable></paragraph>
+    <paragraph role="paragraph" id="par_id311566135070776"><variable id="contextmenurename">Right-click on the page thumbnail and choose <menuitem>Rename Page</menuitem></variable></paragraph>
+    <paragraph role="paragraph" id="par_id141566138212217"><variable id="menupagedelete">Choose <menuitem>Page - Delete Page</menuitem></variable></paragraph>
+    <paragraph role="paragraph" id="par_id261566138218294"><variable id="contextmenudelete">Right-click on the page thumbnail and choose <menuitem>Delete Page</menuitem></variable></paragraph>
+    <paragraph role="paragraph" id="par_id491566139741356"><variable id="menupageduplicate">Choose <menuitem>Page - Duplicate Page</menuitem></variable></paragraph>
+    <paragraph role="paragraph" id="par_id301566157911675"><variable id="pagenavigation">Choose <menuitem>Page - Navigate</menuitem>.</variable></paragraph>
+
   </body>
 </helpdocument>
diff --git a/source/text/sdraw/01/delete_page.xhp b/source/text/sdraw/01/delete_page.xhp
new file mode 100644
index 000000000..2c78bb9b7
--- /dev/null
+++ b/source/text/sdraw/01/delete_page.xhp
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<!--
+* 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/.
+*
+-->
+
+<helpdocument version="1.0">
+    <meta>
+        <topic id="drawdeletepage" indexer="include" status="PUBLISH">
+            <title id="tit" xml-lang="en-US">Delete Page</title>
+            <filename>/text/sdraw/01/delete_page.xhp</filename>
+        </topic>
+    </meta>
+    <body>
+    <section id="deletepage">
+        <h1 id="hd_id3150202"><link href="text/sdraw/01/delete_page.xhp" name="Delete Page">Delete Page</link></h1>
+        <paragraph role="paragraph" id="par_id3152988" xml-lang="en-US">Delete the current page.</paragraph>
+    </section>
+    <section id="howtoget">
+        <embed href="text/sdraw/00/page_menu.xhp#menupagedelete"/>
+        <embed href="text/sdraw/00/page_menu.xhp#contextmenudelete"/>
+    </section>
+</body>
+</helpdocument>
diff --git a/source/text/sdraw/01/duplicate_page.xhp b/source/text/sdraw/01/duplicate_page.xhp
new file mode 100644
index 000000000..54a66f1fe
--- /dev/null
+++ b/source/text/sdraw/01/duplicate_page.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="sdrawduplicatepage" indexer="include" status="PUBLISH">
+            <title id="tit" xml-lang="en-US">Duplicate Page</title>
+            <filename>/text/sdraw/01/duplicate_page.xhp</filename>
+        </topic>
+    </meta>
+    <body>
+    <section id="duplicatepage">
+        <bookmark branch="hid/.uno:DuplicatePage" xml-lang="en-US" id="bm_id3147436" localize="false"/>
+        <h1 id="hd_id3148576"><link href="text/sdraw/01/duplicate_page.xhp" name="Duplicate Page">Duplicate Page</link></h1>
+        <paragraph role="paragraph" id="par_id3153190" xml-lang="en-US"><ahelp hid=".uno:DuplicatePage" visibility="visible">Inserts a copy of the current page after the current page.</ahelp></paragraph>
+    </section>
+    <section id="howtoget">
+        <embed href="text/sdraw/00/page_menu.xhp#menupageduplicate"/>
+    </section>
+</body>
+</helpdocument>
diff --git a/source/text/simpress/01/04020000.xhp b/source/text/sdraw/01/insert_layer.xhp
similarity index 97%
rename from source/text/simpress/01/04020000.xhp
rename to source/text/sdraw/01/insert_layer.xhp
index 158d52802..64c986ed9 100644
--- a/source/text/simpress/01/04020000.xhp
+++ b/source/text/sdraw/01/insert_layer.xhp
@@ -20,12 +20,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-
-		<helpdocument version="1.0">
+<helpdocument version="1.0">
 <meta>
 <topic id="textsimpress0104020000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Insert Layer</title>
-<filename>/text/simpress/01/04020000.xhp</filename>
+<filename>/text/sdraw/01/insert_layer.xhp</filename>
 </topic>
 </meta>
 <body>
diff --git a/source/text/simpress/01/05140000.xhp b/source/text/sdraw/01/modify_layer.xhp
similarity index 98%
rename from source/text/simpress/01/05140000.xhp
rename to source/text/sdraw/01/modify_layer.xhp
index 636c4a554..2f5d33a59 100644
--- a/source/text/simpress/01/05140000.xhp
+++ b/source/text/sdraw/01/modify_layer.xhp
@@ -23,7 +23,7 @@
 <meta>
 <topic id="textsimpress0105140000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Modify Layer</title>
-<filename>/text/simpress/01/05140000.xhp</filename>
+<filename>/text/sdraw/01/modify_layer.xhp</filename>
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
diff --git a/source/text/sdraw/01/navigate_page.xhp b/source/text/sdraw/01/navigate_page.xhp
new file mode 100644
index 000000000..c2a9e93d1
--- /dev/null
+++ b/source/text/sdraw/01/navigate_page.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="page_navigation" indexer="include" status="PUBLISH">
+            <title id="tit" xml-lang="en-US">Page Navigation</title>
+            <filename>/text/sdraw/01/navigate_page.xhp</filename>
+        </topic>
+    </meta>
+    <body>
+    <section id="pagenavigation">
+        <bookmark id="bm_id471566156032976" xml-lang="en-US" branch="hid/zzzz" localize="false"/>
+        <h1 id="hd_id341566156032976"><link href="text/sdraw/01/navigate_page.xhp" name="navigate">Page Navigation</link></h1>
+        <paragraph id="par_id581566156032977" role="paragraph" xml-lang="en-US"><variable id="variable name"><ahelp hid="hid path or command">Opens a sub-menu for page navigation.</ahelp></variable></paragraph>
+    </section>
+    <section id="howtoget">
+        <embed href="text/sdraw/00/page_menu.xhp#pagenavigation"/>
+    </section>
+    <embed href="text/simpress/01/02110000.xhp#pagenavigation"/>
+</body>
+</helpdocument>
diff --git a/source/text/sdraw/01/new_page.xhp b/source/text/sdraw/01/new_page.xhp
index cca246717..c23c8c974 100644
--- a/source/text/sdraw/01/new_page.xhp
+++ b/source/text/sdraw/01/new_page.xhp
@@ -30,9 +30,10 @@
 </history>
 </meta>
 <body>
-<paragraph role="heading" id="hd_id3150202" xml-lang="en-US" level="1"><link href="text/sdraw/01/new_page.xhp" name="New Page">New Page</link></paragraph>
-<paragraph role="paragraph" id="par_id3152988" xml-lang="en-US"><variable id="seitetext">Inserts a blank page after the selected page.
-</variable></paragraph>
+<section id="newpage">
+<h1 id="hd_id3150202"><link href="text/sdraw/01/new_page.xhp" name="New Page">New Page</link></h1>
+<paragraph role="paragraph" id="par_id3152988" xml-lang="en-US">Inserts a blank page after the selected page.</paragraph>
+</section>
 <section id="howtoget">
   <embed href="text/sdraw/00/page_menu.xhp#new_page"/>
 </section>
diff --git a/source/text/sdraw/01/rename_page.xhp b/source/text/sdraw/01/rename_page.xhp
new file mode 100644
index 000000000..0798da22b
--- /dev/null
+++ b/source/text/sdraw/01/rename_page.xhp
@@ -0,0 +1,31 @@
+<?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="drawrenamepage" indexer="include" status="PUBLISH">
+            <title id="tit" xml-lang="en-US">Rename Page</title>
+            <filename>/text/sdraw/01/rename_page.xhp</filename>
+        </topic>
+    </meta>
+    <body>
+    <section id="renamepage">
+        <bookmark id="bm_id661566092814709" xml-lang="en-US" branch="hid/zzzz" localize="false"/>
+        <h1 id="hd_id301566092814709"><link href="text/sdraw/01/rename_page.xhp" name="rename page">Rename Page</link></h1>
+        <paragraph id="par_id511566092814710" role="paragraph" xml-lang="en-US"><variable id="rename_page"><ahelp hid=".">Set a new name for the page.</ahelp></variable></paragraph>
+    </section>
+    <section id="howtoget">
+        <embed href="text/sdraw/00/page_menu.xhp#menupagerename"/>
+        <embed href="text/sdraw/00/page_menu.xhp#contextmenurename"/>
+    </section>
+    <h2 id="hd_id901566134453327">Name</h2>
+    <paragraph role="paragraph" id="par_id371566134462398">Enter the new name of the page.</paragraph>
+</body>
+</helpdocument>
diff --git a/source/text/sdraw/main0100.xhp b/source/text/sdraw/main0100.xhp
index efc2f20f6..c44148058 100644
--- a/source/text/sdraw/main0100.xhp
+++ b/source/text/sdraw/main0100.xhp
@@ -30,21 +30,25 @@
 </history>
 </meta>
 <body>
-  
-  
+
+
   <section id="menues">
-  <paragraph id="hd_id3148664" role="heading" level="1" xml-lang="en-US"><variable id="main0100"><link href="text/sdraw/main0100.xhp" name="Menus">Menus</link></variable></paragraph>
+  <h1 id="hd_id3148664"><variable id="main0100"><link href="text/sdraw/main0100.xhp" name="Menus">Menus</link></variable></h1>
   <paragraph role="paragraph" id="par_id3154684" xml-lang="en-US">The following is a description of all $[officename] Draw menus, submenus and their dialogs.</paragraph>
   </section>
   <embed href="text/shared/00/00000011.xhp#kontexthidden"/>
-  
+
   <embed href="text/sdraw/main0101.xhp#datei"/>
   <embed href="text/sdraw/main_edit.xhp#bearbeiten"/>
   <embed href="text/sdraw/main0103.xhp#ansicht"/>
   <embed href="text/sdraw/main_insert.xhp#einfuegen"/>
   <embed href="text/sdraw/main_format.xhp#format"/>
+  <embed href="text/sdraw/main_page.xhp#page"/>
+  <embed href="text/sdraw/main_shape.xhp#shape"/>
   <embed href="text/sdraw/main_tools.xhp#extras"/>
+  <!--
   <embed href="text/simpress/main0113.xhp#aendern"/>
+  -->
   <embed href="text/simpress/main0107.xhp#window"/>
   <embed href="text/shared/main0108.xhp#hilfe"/>
  </body>
diff --git a/source/text/sdraw/main_format.xhp b/source/text/sdraw/main_format.xhp
index 77251c5e0..85bf06154 100644
--- a/source/text/sdraw/main_format.xhp
+++ b/source/text/sdraw/main_format.xhp
@@ -50,8 +50,8 @@
 <embed href="text/shared/01/05210000.xhp#flaechetext"/>
 <paragraph role="heading" id="hd_id3153878" xml-lang="en-US" level="2"><link href="text/shared/01/05990000.xhp" name="Text">Text</link></paragraph>
 <embed href="text/shared/01/05990000.xhp#texttext"/>
-<paragraph role="heading" id="hd_id3153913" xml-lang="en-US" level="2"><link href="text/simpress/01/05140000.xhp" name="Layer">Layer</link></paragraph>
-<embed href="text/simpress/01/05140000.xhp#ebene"/>
+<h2 id="hd_id3153913"><link href="text/sdraw/01/modify_layer.xhp" name="Layer">Layer</link></h2>
+<embed href="text/sdraw/01/modify_layer.xhp#ebene"/>
 <embed href="text/simpress/01/05100000.xhp#gestalter"/>
 </body>
 </helpdocument>
diff --git a/source/text/sdraw/main_insert.xhp b/source/text/sdraw/main_insert.xhp
index fc42e390c..0e1c55615 100644
--- a/source/text/sdraw/main_insert.xhp
+++ b/source/text/sdraw/main_insert.xhp
@@ -28,32 +28,37 @@
    </meta>
    <body>
       <section id="einfuegen">
-         <paragraph xml-lang="en-US" id="hd_id3148797" role="heading" level="1"><link href="text/sdraw/main_insert.xhp" name="Insert">Insert</link></paragraph>
+         <h1 id="hd_id3148797"><link href="text/sdraw/main_insert.xhp" name="Insert">Insert</link></h1>
          <paragraph xml-lang="en-US" id="par_id3153770" role="paragraph">This menu allows you to insert elements, such as graphics and guides, into Draw documents.</paragraph>
       </section>
-      <embed href="text/simpress/01/04120000.xhp#seiteduplizieren"/>
-      <paragraph xml-lang="en-US" id="hd_id3146974" role="heading" level="2"><link href="text/simpress/01/04020000.xhp" name="Layer">Layer</link></paragraph>
-      <embed href="text/simpress/01/04020000.xhp#ebenetext"/>
-      <paragraph xml-lang="en-US" id="hd_id3147397" role="heading" level="2"><link href="text/simpress/01/04030000.xhp" name="Insert Snap Point/Line">Insert Snap Point/Line</link></paragraph>
-      <embed href="text/simpress/01/04030000.xhp#fangtext"/>
-      <embed href="text/simpress/01/04990000.xhp#feldbefehl"/>
-      <paragraph xml-lang="en-US" id="hd_id0915200910361385" role="heading" level="2"><link href="text/shared/01/04050000.xhp" name="Comment">Comment</link></paragraph>
-      <embed href="text/shared/01/04050000.xhp#notizbearbeitentext"/>
-      <paragraph xml-lang="en-US" id="hd_id3154018" role="heading" level="2"><link href="text/shared/01/04100000.xhp" name="Special Character">Special Character</link></paragraph>
-      <embed href="text/shared/01/04100000.xhp#sonder"/>
-      <embed href="text/shared/01/formatting_mark.xhp#formatting_mark"/>
-      <paragraph xml-lang="en-US" id="hd_id3150749" role="heading" level="2"><link href="text/shared/02/09070000.xhp" name="Hyperlink">Hyperlink</link></paragraph>
-      <embed href="text/shared/02/09070000.xhp#hyperdiatext"/>
-      <paragraph xml-lang="en-US" id="hd_id3156385" role="heading" level="2"><link href="text/simpress/01/04080100.xhp" name="Table">Table</link></paragraph>
+
+      <h2 id="hd_id591566076088696"><link href="text/sdraw/guide/graphic_insert.xhp" name="linkname">Image</link></h2>
+      <paragraph role="paragraph" id="par_id91566076127444">Insert an image</paragraph>
+      <embed href="text/shared/menu/insert_chart.xhp#chart"/>
+      <h2 id="hd_id3156385"><link href="text/simpress/01/04080100.xhp" name="Table">Table</link></h2>
       <embed href="text/simpress/01/04080100.xhp#tabelletext"/>
       <embed href="text/shared/01/04990000.xhp#grafik"/>
-      <embed href="text/shared/01/moviesound.xhp#moviesound"/>
       <embed href="text/shared/01/04150000.xhp#objekt"/>
-      <paragraph xml-lang="en-US" id="hd_id3147003" role="heading" level="2"><link href="text/schart/01/wiz_chart_type.xhp" name="Chart">Chart</link></paragraph>
-      <paragraph xml-lang="en-US" id="par_id0302200904020595" role="paragraph">Inserts a chart.</paragraph>
-      <paragraph xml-lang="en-US" id="hd_id3155111" role="heading" level="2"><link href="text/shared/01/04160500.xhp" name="Floating Frame">Floating Frame</link></paragraph>
+      <h2 id="hd_id3147397"><link href="text/simpress/01/04030000.xhp" name="Insert Snap Point/Line">Insert Snap Point/Line</link></h2>
+      <embed href="text/simpress/01/04030000.xhp#fangtext"/>
+      <h2 id="hd_id3146974"><link href="text/sdraw/01/insert_layer.xhp" name="Layer">Layer</link></h2>
+      <embed href="text/sdraw/01/insert_layer.xhp#ebenetext"/>
+      <h2 id="hd_id871566077404783">Text Box</h2>
+      <paragraph role="paragraph" id="par_id161566077419991">Insert a text box</paragraph>
+      <h2 id="hd_id0915200910361385"><link href="text/shared/01/04050000.xhp" name="Comment">Comment</link></h2>
+      <embed href="text/shared/01/04050000.xhp#notizbearbeitentext"/>
+      <h2 id="hd_id3155111"><link href="text/shared/01/04160500.xhp" name="Floating Frame">Floating Frame</link></h2>
       <embed href="text/shared/01/04160500.xhp#frameeinfuegentext"/>
-      <paragraph xml-lang="en-US" id="hd_id3157867" role="heading" level="2"><link href="text/simpress/01/04110000.xhp" name="File">File</link></paragraph>
-      <embed href="text/simpress/01/04110000.xhp#dateitext"/>
+      <h2 id="hd_id281566080377117"><link href="text/shared/guide/fontwork.xhp" name="Fontwork">FontWork</link></h2>
+      <embed href="text/shared/guide/fontwork.xhp#fontwork01"/>
+      <h2 id="hd_id3150749"><link href="text/shared/02/09070000.xhp" name="Hyperlink">Hyperlink</link></h2>
+      <embed href="text/shared/02/09070000.xhp#hyperdiatext"/>
+      <h2 id="hd_id3154018"><link href="text/shared/01/04100000.xhp" name="Special Character">Special Character</link></h2>
+      <embed href="text/shared/01/04100000.xhp#sonder"/>
+      <embed href="text/shared/01/formatting_mark.xhp#formatting_mark"/>
+      <h2 id="hd_id961566081928998">Page Number</h2>
+      <paragraph role="paragraph" id="par_id601566081921518">Insert a text box with the current page number.</paragraph>
+      <embed href="text/simpress/01/04990000.xhp#feldbefehl"/>
+      <embed href="text/shared/menu/insert_form_control.xhp#form_control_submenu"/>
    </body>
 </helpdocument>
diff --git a/source/text/sdraw/main_page.xhp b/source/text/sdraw/main_page.xhp
index d4ff0959a..48ac8523c 100644
--- a/source/text/sdraw/main_page.xhp
+++ b/source/text/sdraw/main_page.xhp
@@ -27,17 +27,32 @@
 
 <body>
 
-
 <section id="page">
 <bookmark xml-lang="en-US" branch="hid/.uno:PageMenu" id="bm_id561556822303590" localize="false"/>
-
-<paragraph id="hd_id41556822227733" role="heading" level="1" xml-lang="en-US"><link href="text/simpress/main_slide.xhp">Page</link></paragraph>
-<paragraph id="par_id771556822318420" role="paragraph" xml-lang="en-US">This menu provides page management and navigation commands.</paragraph>
+<h1 id="hd_id41556822227733"><link href="text/sdraw/main_page.xhp">Page</link></h1>
+<paragraph id="par_id771556822318420" role="paragraph" xml-lang="en-US">This menu provides drawing page management and navigation commands.</paragraph>
 </section>
-<paragraph xml-lang="en-US" id="hd_id131556822326832" role="heading" level="2"><link href="text/sdraw/01/new_page.xhp" name="New Page">New Page</link></paragraph>
-<embed href="text/sdraw/01/new_page.xhp#seitetext"/>
-<paragraph role="heading" id="hd_id3155091" xml-lang="en-US" level="2"><link href="text/sdraw/01/page_properties.xhp" name="Properties">Properties</link></paragraph>
+
+<embed href="text/sdraw/01/new_page.xhp#newpage"/>
+<embed href="text/sdraw/01/duplicate_page.xhp#duplicatepage"/>
+<embed href="text/simpress/01/04110100.xhp#insertslidepageobject"/>
+<embed href="text/sdraw/01/rename_page.xhp#renamepage"/>
+<embed href="text/sdraw/01/delete_page.xhp#deletepage"/>
+<embed href="text/shared/menu/save_image.xhp#saveimageh1"/>
+<embed href="text/shared/menu/set_image_background.xhp#setimageh1"/>
+<h2 id="hd_id3155091"><link href="text/sdraw/01/page_properties.xhp" name="Properties">Properties</link></h2>
 <embed href="text/sdraw/01/page_properties.xhp#seiteeintext"/>
-</body>
 
+
+<h2 id="hd_id371566154570590">Master Page</h2>
+<h2 id="hd_id141566154574560">New Master</h2>
+<h2 id="hd_id951566154577653">Delete Master</h2>
+<h2 id="hd_id501566154580871">Master background</h2>
+<h2 id="hd_id121566154584270">Master Objects</h2>
+<h2 id="hd_id921566154587452">Master Elements</h2>
+<h2 id="hd_id631566154595170">Move</h2>
+<embed href="text/sdraw/01/navigate_page.xhp#pagenavigation"/>
+
+
+</body>
 </helpdocument>
diff --git a/source/text/sdraw/main_shape.xhp b/source/text/sdraw/main_shape.xhp
new file mode 100644
index 000000000..304a7da29
--- /dev/null
+++ b/source/text/sdraw/main_shape.xhp
@@ -0,0 +1,25 @@
+<?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="mainmenushape" indexer="include" status="PUBLISH">
+            <title id="tit" xml-lang="en-US">Shape</title>
+            <filename>/text/sdraw/main_shape.xhp</filename>
+        </topic>
+    </meta>
+    <body>
+    <section id="shape">
+        <bookmark id="bm_id571558217682353" xml-lang="en-US" branch="hid/zzzz" localize="false"/>
+        <h1 id="hd_id381558217682354"><link href="text/sdraw/main_shape.xhp" name="shape menu">Shape</link></h1>
+        <paragraph id="par_id91558217682355" role="paragraph" xml-lang="en-US"><variable id="shapevar"><ahelp hid=".">This menu provides shape objects management.</ahelp></variable></paragraph>
+
+    </section>
+</body>
+</helpdocument>
diff --git a/source/text/shared/02/01170000.xhp b/source/text/shared/02/01170000.xhp
index 41f530fa1..d192476c3 100644
--- a/source/text/shared/02/01170000.xhp
+++ b/source/text/shared/02/01170000.xhp
@@ -25,7 +25,7 @@
   </topic>
 </meta>
 <body>
-<section id="formularfunktionen">
+
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154142"><bookmark_value>form controls;toolbars</bookmark_value>
 <bookmark_value>inserting; form fields</bookmark_value>
 <bookmark_value>form fields</bookmark_value>
@@ -46,9 +46,9 @@
 <bookmark_value>controls; select mode</bookmark_value>
 </bookmark><comment>MW deleted "option field creation", changed "option button" to "push button" and "selections;" to "selecting;"</comment>
 <bookmark xml-lang="en-US" branch="hid/.uno:Config" id="bm_id4029443" localize="false"/>
-<paragraph role="heading" id="hd_id3154142" xml-lang="en-US" level="1"><link href="text/shared/02/01170000.xhp" name="Form Controls">Form Controls</link></paragraph>
-<paragraph role="paragraph" id="par_id3151378" xml-lang="en-US"><variable id="formulartext"><ahelp hid=".uno:Config">The <emph>Form Controls</emph> toolbar contains tools that you need to create an interactive form.</ahelp>
-</variable> You can use the toolbar to add controls to a form in a text, spreadsheet, presentation, or HTML document, for example a button that runs a macro.</paragraph>
+<section id="formularfunktionen">
+<h1 id="hd_id3154142"><link href="text/shared/02/01170000.xhp" name="Form Controls">Form Controls</link></h1>
+<paragraph role="paragraph" id="par_id3151378" xml-lang="en-US"><variable id="formulartext"><ahelp hid=".uno:Config">The <emph>Form Controls</emph> toolbar or sub-menu contains tools that you need to create an interactive form.</ahelp></variable> You can use the toolbar or sub-menu to add controls to a form in a text, drawing, spreadsheet, presentation, or HTML document, for example a button that runs a macro.</paragraph>
 </section>
 <section id="howtoget">
 <paragraph role="paragraph" id="par_id1027200809391346" xml-lang="en-US">Choose <item type="menuitem">View - Toolbars - Form Controls</item>.</paragraph>
diff --git a/source/text/shared/guide/fontwork.xhp b/source/text/shared/guide/fontwork.xhp
index 43f22311e..d6be673c4 100644
--- a/source/text/shared/guide/fontwork.xhp
+++ b/source/text/shared/guide/fontwork.xhp
@@ -44,7 +44,7 @@
 <bookmark xml-lang="en-US" branch="hid/svx/ui/fontworkgallerydialog/FontworkGalleryDialog" id="bm_id3156416" localize="false"/>
 <paragraph xml-lang="en-US" id="par_idN1066D" role="heading" level="1"><variable id="fontwork"><link href="text/shared/guide/fontwork.xhp">Fontwork For Graphical Text Art</link>
 </variable></paragraph>
-      <paragraph xml-lang="en-US" id="par_idN1068B" role="paragraph">You can use Fontwork to create graphical text art objects.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN1068B" role="paragraph"><variable id="fontwork01">You can use Fontwork to create graphical text art objects.</variable></paragraph>
       <paragraph xml-lang="en-US" id="par_idN10691" role="heading" level="2">To create a Fontwork object</paragraph>
       <list type="ordered">
          <listitem>
diff --git a/source/text/shared/menu/insert_form_control.xhp b/source/text/shared/menu/insert_form_control.xhp
index 82e1badda..68a85f329 100644
--- a/source/text/shared/menu/insert_form_control.xhp
+++ b/source/text/shared/menu/insert_form_control.xhp
@@ -1,39 +1,35 @@
 <?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 .
--->
+    <!--
+    * 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_form_controlxml">
-    <title id="tit" xml-lang="en-US">Form Control</title>
-    <filename>/text/shared/menu/insert_form_control.xhp</filename>
-  </topic>
-</meta>
-
-<body>
-
-
-<section id="form_control_submenu">
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertFrameInteract" id="bm_id030720160612074867" localize="false"/>
-
-<paragraph id="hd_id030720160611303537" role="heading" level="1" xml-lang="en-US"><link href="text/shared/menu/insert_form_control.xhp">Form Control</link></paragraph>
-<paragraph id="par_id03072016061205929" role="paragraph" xml-lang="en-US"><ahelp hid=".">This submenu contains form controls like a textbox, checkbox, option button, and listbox that can be inserted into the document.</ahelp></paragraph>
-</section>
-</body>
+    <meta>
+        <topic id="textsharedmenuinsert_form_controlxml">
+            <title id="tit" xml-lang="en-US">Form Control Menu</title>
+            <filename>/text/shared/menu/insert_form_control.xhp</filename>
+        </topic>
+    </meta>
 
+    <body>
+    <section id="form_control_submenu">
+        <bookmark xml-lang="en-US" branch="hid/.uno:InsertFrameInteract" id="bm_id030720160612074867" localize="false"/>
+        <h1 id="hd_id030720160611303537"><link href="text/shared/menu/insert_form_control.xhp">Form Control</link></h1>
+        <paragraph id="par_id03072016061205929" role="paragraph" xml-lang="en-US"><ahelp hid=".">This submenu contains form controls like a textbox, checkbox, option button, and listbox that can be inserted into the document.</ahelp></paragraph>
+    </section>
+    </body>
 </helpdocument>
diff --git a/source/text/shared/menu/save_image.xhp b/source/text/shared/menu/save_image.xhp
new file mode 100644
index 000000000..2e2591c4b
--- /dev/null
+++ b/source/text/shared/menu/save_image.xhp
@@ -0,0 +1,37 @@
+<?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="saveimage" indexer="include" status="PUBLISH">
+            <title id="tit" xml-lang="en-US">Save Image</title>
+            <filename>/text/shared/menu/save_image.xhp</filename>
+        </topic>
+    </meta>
+    <body>
+    <bookmark xml-lang="en-US" branch="index" id="bm_id561566144886972">
+        <bookmark_value>page;save background image</bookmark_value>
+        <bookmark_value>slide;save background image</bookmark_value>
+        <bookmark_value>page background image;save</bookmark_value>
+        <bookmark_value>slide background image;save</bookmark_value>
+    </bookmark>
+    <section id="saveimageh1">
+        <bookmark id="bm_id761566143431255" xml-lang="en-US" branch="hid/.uno:SaveBackgroundImage" localize="false"/>
+        <h1 id="hd_id881566143431255"><link href="text/shared/menu/save_image.xhp" name="savebackgroundimage">Save Background Image</link></h1>
+        <paragraph id="par_id121566143431256" role="paragraph" xml-lang="en-US"><variable id="variable name"><ahelp hid=".uno:SaveBackground">Saves <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline> background image of the current <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline>.</ahelp></variable></paragraph>
+
+    </section>
+    <section id="howtoget">
+        <paragraph role="paragraph" id="par_id91566150694760">Choose <switchinline select="appl"><caseinline select="IMPRESS"><menuitem>Slide</menuitem></caseinline><defaultinline><menuitem>Page</menuitem></defaultinline></switchinline> - <menuitem>Save Background Image</menuitem>.</paragraph>
+    </section>
+    <paragraph role="paragraph" id="par_id291566144541584">Opens the <emph>Export Image</emph> dialog to save the background image of the current <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline>. Select the image file format in the Filter box and insert a file name for the image and press Save.</paragraph>
+    <note id="par_id841566144548379">Depending on the file format chosen, a dialog appears to set the image format properties.</note>
+</body>
+</helpdocument>
diff --git a/source/text/shared/menu/set_image_background.xhp b/source/text/shared/menu/set_image_background.xhp
new file mode 100644
index 000000000..0123e024e
--- /dev/null
+++ b/source/text/shared/menu/set_image_background.xhp
@@ -0,0 +1,36 @@
+<?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="setimage" indexer="include" status="PUBLISH">
+            <title id="tit" xml-lang="en-US">Set Image Background</title>
+            <filename>/text/shared/menu/set_image_background.xhp</filename>
+        </topic>
+    </meta>
+    <body>
+    <bookmark xml-lang="en-US" branch="index" id="bm_id561566144886972">
+<bookmark_value>page;set background image</bookmark_value>
+<bookmark_value>slide;set background image</bookmark_value>
+<bookmark_value>page background image;set</bookmark_value>
+<bookmark_value>slide background image;set</bookmark_value>
+    </bookmark>
+    <section id="setimageh1">
+        <bookmark id="bm_id761566143431255" xml-lang="en-US" branch="hid/.uno:SelectBackground" localize="false"/>
+        <h1 id="hd_id881566143431255"><link href="text/shared/menu/set_image_background.xhp" name="setbackgroundimage">Set Background Image</link></h1>
+        <paragraph id="par_id121566143431256" role="paragraph" xml-lang="en-US"><variable id="setimagebackground"><ahelp hid=".uno:SelectBackground">Set <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline> background image of the current <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline>.</ahelp></variable></paragraph>
+
+    </section>
+    <section id="howtoget">
+        <paragraph role="paragraph" id="par_id91566150694760">Choose <switchinline select="appl"><caseinline select="IMPRESS"><menuitem>Slide</menuitem></caseinline><defaultinline><menuitem>Page</menuitem></defaultinline></switchinline> - <menuitem>Set Background Image</menuitem>.</paragraph>
+    </section>
+    <paragraph role="paragraph" id="par_id291566144541584">Opens the <emph>Set Image Background</emph> dialog to set the background image of the current <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline>. Select image file and press Open.</paragraph>
+</body>
+</helpdocument>
diff --git a/source/text/simpress/01/02110000.xhp b/source/text/simpress/01/02110000.xhp
index c60ee2384..71f018635 100644
--- a/source/text/simpress/01/02110000.xhp
+++ b/source/text/simpress/01/02110000.xhp
@@ -46,74 +46,77 @@
 <paragraph role="tip" id="par_id3156448" xml-lang="en-US">Press <item type="keycode">Ctrl+Shift+F5</item> to open the Navigator when you are editing a presentation.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD_HID_SD_NAVIGATOR_TBI_PEN" id="bm_id3150538" localize="false"/><paragraph role="heading" id="hd_id3145235" xml-lang="en-US" level="2">Pointer</paragraph>
 <paragraph role="paragraph" id="par_id3157874" xml-lang="en-US"><ahelp hid="HID_SD_NAVIGATOR_TBI_PEN">Switches the mouse pointer to a pen that you can use to write on slides during a slide show.</ahelp> You cannot change the color of the pen.</paragraph>
+
+
+
 <table id="tbl_id3150651">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3148729" xml-lang="en-US">
-<image id="img_id3153034" src="sd/res/nv02.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153034" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
+<image id="img_id3153034" src="sd/res/nv02.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153034" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3150862" xml-lang="en-US">Pointer</paragraph>
 </tablecell>
 </tablerow>
 </table>
-<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/navigatorpanel/first" id="bm_id3153110" localize="false"/><paragraph role="heading" id="hd_id3152999" xml-lang="en-US" level="2">First Slide</paragraph>
-<paragraph role="paragraph" id="par_id3153564" xml-lang="en-US"><ahelp hid="modules/simpress/ui/navigatorpanel/first">Jumps to the first slide in the slide show.</ahelp></paragraph>
-<table id="tbl_id3154501">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155925" xml-lang="en-US">
-<image id="img_id3155931" src="cmd/sc_firstrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155931" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145246" xml-lang="en-US">First Page</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/navigatorpanel/previous" id="bm_id3148390" localize="false"/><paragraph role="heading" id="hd_id3156061" xml-lang="en-US" level="2">Previous Slide</paragraph>
-<paragraph role="paragraph" id="par_id3148768" xml-lang="en-US"><ahelp hid="modules/simpress/ui/navigatorpanel/previous">Moves back one slide in the slide show.</ahelp></paragraph>
-<table id="tbl_id3150265">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153045" xml-lang="en-US">
-<image id="img_id3157976" src="cmd/sc_prevrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3157976" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150473" xml-lang="en-US">Previous Slide</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/navigatorpanel/next" id="bm_id3155988" localize="false"/><paragraph role="heading" id="hd_id3155369" xml-lang="en-US" level="2">Next Slide</paragraph>
-<paragraph role="paragraph" id="par_id3153920" xml-lang="en-US"><ahelp hid="modules/simpress/ui/navigatorpanel/next">Move forward one slide in the slide show.</ahelp></paragraph>
-<table id="tbl_id3155401">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3083279" xml-lang="en-US">
-<image id="img_id3083286" src="cmd/sc_nextrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3083286" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149454" xml-lang="en-US">Next Slide</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/navigatorpanel/last" id="bm_id3145208" localize="false"/><paragraph role="heading" id="hd_id3150762" xml-lang="en-US" level="2">Last Slide</paragraph>
-<paragraph role="paragraph" id="par_id3147564" xml-lang="en-US"><ahelp hid="modules/simpress/ui/navigatorpanel/last">Jumps to the last slide in the slide show.</ahelp></paragraph>
-<table id="tbl_id3152935">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151183" xml-lang="en-US">
-<image id="img_id3156315" src="cmd/sc_lastrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156315" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154055" xml-lang="en-US">Last Slide</paragraph>
-</tablecell>
-</tablerow>
-</table>
+
+<section id="pagenavigation">
+    <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/navigatorpanel/first" id="bm_id3153110" localize="false"/>
+    <h2 id="hd_id3152999">First <switchinline select="appl"><caseinline select="IMPRESS">Slide</caseinline><defaultinline>Page</defaultinline></switchinline></h2>
+    <paragraph role="paragraph" id="par_id3153564" xml-lang="en-US"><ahelp hid="modules/simpress/ui/navigatorpanel/first">Jumps to the first <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline>.</ahelp></paragraph>
+    <table id="tbl_id3154501">
+        <tablerow>
+            <tablecell>
+                <paragraph role="paragraph" id="par_id3155925" xml-lang="en-US"><image id="img_id3155931" src="cmd/sc_firstrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155931" xml-lang="en-US">Icon First Slide</alt></image></paragraph>
+            </tablecell>
+            <tablecell>
+                <paragraph role="paragraph" id="par_id3145246" xml-lang="en-US">First <switchinline select="appl"><caseinline select="IMPRESS">Slide</caseinline><defaultinline>Page</defaultinline></switchinline></paragraph>
+            </tablecell>
+        </tablerow>
+    </table>
+    <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/navigatorpanel/previous" id="bm_id3148390" localize="false"/>
+    <h2 id="hd_id3156061">Previous <switchinline select="appl"><caseinline select="IMPRESS">Slide</caseinline><defaultinline>Page</defaultinline></switchinline></h2>
+    <paragraph role="paragraph" id="par_id3148768" xml-lang="en-US"><ahelp hid="modules/simpress/ui/navigatorpanel/previous">Moves back one <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline>.</ahelp></paragraph>
+    <table id="tbl_id3150265">
+        <tablerow>
+            <tablecell>
+                <paragraph role="paragraph" id="par_id3153045" xml-lang="en-US"><image id="img_id3157976" src="cmd/sc_prevrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3157976" xml-lang="en-US">Icon Previous Slide</alt></image></paragraph>
+            </tablecell>
+            <tablecell>
+                <paragraph role="paragraph" id="par_id3150473" xml-lang="en-US">Previous <switchinline select="appl"><caseinline select="IMPRESS">Slide</caseinline><defaultinline>Page</defaultinline></switchinline></paragraph>
+            </tablecell>
+        </tablerow>
+    </table>
+    <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/navigatorpanel/next" id="bm_id3155988" localize="false"/>
+    <h2 id="hd_id3155369">Next <switchinline select="appl"><caseinline select="IMPRESS">Slide</caseinline><defaultinline>Page</defaultinline></switchinline></h2>
+    <paragraph role="paragraph" id="par_id3153920" xml-lang="en-US"><ahelp hid="modules/simpress/ui/navigatorpanel/next">Move forward one <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline>.</ahelp></paragraph>
+    <table id="tbl_id3155401">
+        <tablerow>
+            <tablecell>
+                <paragraph role="paragraph" id="par_id3083279" xml-lang="en-US">
+                    <image id="img_id3083286" src="cmd/sc_nextrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3083286" xml-lang="en-US">Icon Next Slide</alt></image></paragraph>
+            </tablecell>
+            <tablecell>
+                <paragraph role="paragraph" id="par_id3149454" xml-lang="en-US">Next <switchinline select="appl"><caseinline select="IMPRESS">Slide</caseinline><defaultinline>Page</defaultinline></switchinline></paragraph>
+            </tablecell>
+        </tablerow>
+    </table>
+    <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/navigatorpanel/last" id="bm_id3145208" localize="false"/>
+    <h2 id="hd_id3150762">Last <switchinline select="appl"><caseinline select="IMPRESS">Slide</caseinline><defaultinline>Page</defaultinline></switchinline></h2>
+    <paragraph role="paragraph" id="par_id3147564" xml-lang="en-US"><ahelp hid="modules/simpress/ui/navigatorpanel/last">Jumps to the last <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline>.</ahelp></paragraph>
+    <table id="tbl_id3152935">
+        <tablerow>
+            <tablecell>
+                <paragraph role="paragraph" id="par_id3151183" xml-lang="en-US"><image id="img_id3156315" src="cmd/sc_lastrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156315" xml-lang="en-US">Icon Last Record</alt></image></paragraph>
+            </tablecell>
+            <tablecell>
+                <paragraph role="paragraph" id="par_id3154055" xml-lang="en-US">Last <switchinline select="appl"><caseinline select="IMPRESS">Slide</caseinline><defaultinline>Page</defaultinline></switchinline></paragraph>
+            </tablecell>
+        </tablerow>
+    </table>
+</section>
+
 <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/navigatorpanel/dragmode" id="bm_id3150258" localize="false"/><paragraph role="heading" id="hd_id3149979" xml-lang="en-US" level="2">Drag Mode</paragraph>
 <paragraph role="paragraph" id="par_id3150264" xml-lang="en-US"><ahelp hid="modules/simpress/ui/navigatorpanel/dragmode">Drag and drop slides and named objects into the active slide.</ahelp> You can only insert slides and named objects from a saved file. You can only insert named objects as copies.</paragraph>
 <table id="tbl_id3149286">
diff --git a/source/text/simpress/01/04110000.xhp b/source/text/simpress/01/04110000.xhp
index 771e68185..dc39d1de8 100644
--- a/source/text/simpress/01/04110000.xhp
+++ b/source/text/simpress/01/04110000.xhp
@@ -18,7 +18,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="textsimpress0104110000xml" indexer="include" status="PUBLISH">
@@ -35,9 +35,12 @@
 <bookmark_value>HTML; inserting files</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/.uno:ImportFromFile" id="bm_id3867585" localize="false"/>
-<paragraph role="heading" id="hd_id3153728" xml-lang="en-US" level="1"><link href="text/simpress/01/04110000.xhp" name="Insert File">Insert File</link></paragraph>
-<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US"><variable id="dateitext"><ahelp hid=".uno:ImportFromFile">Inserts a file into the active slide. You can insert $[officename] Draw or Impress files, or text from an HTML document or a text file.</ahelp>
-</variable> If you have an active internet connection, you can also insert text from a web page by entering its URL in the <emph>File name </emph>box.</paragraph>
+
+<section id="insertfile">
+<h1 id="hd_id3153728"><link href="text/simpress/01/04110000.xhp" name="Insert File">Insert File</link></h1>
+<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US"><variable id="dateitext"><ahelp hid=".uno:ImportFromFile">Inserts a file into the active <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline>. You can insert $[officename] Draw or Impress files, or text from an HTML document or a text file.</ahelp></variable> If you have an active internet connection, you can also insert text from a web page by entering its URL in the <emph>File name </emph>box.</paragraph>
+</section>
+
 <section id="howtoget">
 <embed href="text/simpress/00/00000404.xhp#efgdti"/>
 </section>
diff --git a/source/text/simpress/01/04110100.xhp b/source/text/simpress/01/04110100.xhp
index c37ae35fe..5785442a6 100644
--- a/source/text/simpress/01/04110100.xhp
+++ b/source/text/simpress/01/04110100.xhp
@@ -37,8 +37,10 @@
 <bookmark_value>inserting; slides as links</bookmark_value>
 <bookmark_value>backgrounds; deleting unused</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3146976" xml-lang="en-US" level="1">Insert Slides/Objects</paragraph>
+<section id="insertslidepageobject">
+    <h1 id="hd_id3146976"><link href="text/simpress/01/04110100.xhp" name="Insert page">Insert <switchinline select="appl"><caseinline select="IMPRESS">Slide</caseinline><defaultinline>Page</defaultinline></switchinline>/Objects from File</link></h1>
 <paragraph role="paragraph" id="par_id3151073" xml-lang="en-US">Allows you to insert the entire file or specific elements in the file.</paragraph>
+</section>
 <section id="howtoget">
   <embed href="text/simpress/00/00000404.xhp#efgdti"/>
 </section>
commit 1848284e83e609f092f80c55dce108c22964699f
Author:     Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Sat Aug 17 13:12:26 2019 -0300
Commit:     Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Mon Aug 19 00:21:40 2019 +0200

    tdf#43527 revisit Insert Comments
    
    Change-Id: I3cdf7f4672641718df7668e23e3d57187ed26d33
    Reviewed-on: https://gerrit.libreoffice.org/77644
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/Package_html_media.mk b/Package_html_media.mk
index 2876863f1..bdfff054e 100644
--- a/Package_html_media.mk
+++ b/Package_html_media.mk
@@ -78,16 +78,19 @@ $(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
     helpimg/rotieren.png \
     helpimg/sc_PivotChartButtons.png \
     helpimg/sc_data_form01.png \
+    helpimg/sc_cell_with_comment_displayed.png \
     helpimg/sc_func_imcot.png \
     helpimg/sc_func_imcsc.png \
     helpimg/sc_func_imcsch.png \
     helpimg/sc_func_imsec.png \
     helpimg/sc_func_imsech.png \
     helpimg/sc_func_imtan.png \
+    helpimg/sd_drawing_with_comment.png \
     helpimg/sd_PresenterConsole01.png \
     helpimg/sd_PresenterConsole02.png \
     helpimg/sd_PresenterConsole03.png \
     helpimg/sd_PresenterConsole04.png \
+    helpimg/si_presentation_with_comment.png \
     helpimg/sheettabs.png \
     helpimg/sistop.png \
     helpimg/smzb1.png \
@@ -223,7 +226,7 @@ $(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
     helpimg/starmath/fu21523.svg \
     helpimg/starmath/fu21524.svg \
     helpimg/starmath/fu21908.svg \
-	helpimg/starmath/im21106.svg \
+    helpimg/starmath/im21106.svg \
     helpimg/starmath/mi21608.svg \
     helpimg/starmath/mi21612.svg \
     helpimg/starmath/mi21618.svg \
@@ -286,6 +289,7 @@ $(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
     helpimg/sw_paste_range.png \
     helpimg/sw_signatureline01.png \
     helpimg/sw_signatureline02.png \
+    helpimg/sw_text_with_comment.png \
     helpimg/swh00055.png \
     helpimg/swh00056.png \
     helpimg/swh00117.png \
diff --git a/source/media/helpimg/sc_cell_with_comment_displayed.png b/source/media/helpimg/sc_cell_with_comment_displayed.png
new file mode 100644
index 000000000..7f0df7216
Binary files /dev/null and b/source/media/helpimg/sc_cell_with_comment_displayed.png differ
diff --git a/source/media/helpimg/sd_drawing_with_comment.png b/source/media/helpimg/sd_drawing_with_comment.png
new file mode 100644
index 000000000..a9c4694f8
Binary files /dev/null and b/source/media/helpimg/sd_drawing_with_comment.png differ
diff --git a/source/media/helpimg/si_presentation_with_comment.png b/source/media/helpimg/si_presentation_with_comment.png
new file mode 100644
index 000000000..44e24c93e
Binary files /dev/null and b/source/media/helpimg/si_presentation_with_comment.png differ
diff --git a/source/media/helpimg/sw_text_with_comment.png b/source/media/helpimg/sw_text_with_comment.png
new file mode 100644
index 000000000..e2876fd28
Binary files /dev/null and b/source/media/helpimg/sw_text_with_comment.png differ
diff --git a/source/text/shared/00/00000404.xhp b/source/text/shared/00/00000404.xhp
index 86c74cfcb..b46bd31bc 100644
--- a/source/text/shared/00/00000404.xhp
+++ b/source/text/shared/00/00000404.xhp
@@ -29,8 +29,9 @@
 </topic>
 </meta>
 <body>
-<paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="1">Insert Menu</paragraph>
+<h1 id="hd_id3156324">Insert Menu</h1>
 <paragraph role="paragraph" id="par_id3153808" xml-lang="en-US"><variable id="notiz">Choose <emph>Insert - Comment</emph>.</variable></paragraph>
+<paragraph role="paragraph" id="par_id3253808" xml-lang="en-US"><variable id="notizkbd">Key <switchinline select="sys"><caseinline select="MAC"><emph>Command</emph>+<emph>Option</emph></caseinline><defaultinline><emph>Ctrl</emph>+<emph>Alt</emph></defaultinline></switchinline>+<emph>C</emph>.</variable></paragraph>
 <section id="scannen">
 <paragraph role="paragraph" id="par_id3155619" xml-lang="en-US">Choose <emph>Insert - Media - Scan</emph>.</paragraph>
 </section>
@@ -50,11 +51,11 @@
 <section id="sysonder">
 <table id="tbl_id3149388">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3153527" xml-lang="en-US">
 <image id="img_id3153748" src="cmd/sc_bullet.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153748" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3149751" xml-lang="en-US">Special Character</paragraph>
 </tablecell>
 </tablerow>
@@ -67,8 +68,7 @@
 <section id="symoviesound">
 <table id="">
 <tablerow>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_idN1085D" xml-lang="en-US">Audio or Video</paragraph>
 </tablecell>
 </tablerow>
@@ -82,11 +82,11 @@
 <section id="syole">
 <table id="tbl_id3153348">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3150254" xml-lang="en-US">
 <image id="img_id3156305" src="cmd/sc_insobjctrl.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156305" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3145417" xml-lang="en-US">OLE Object</paragraph>
 </tablecell>
 </tablerow>
@@ -99,11 +99,11 @@
 <section id="systarmath">
 <table id="tbl_id3155432">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3148559" xml-lang="en-US">
 <image id="img_id3149933" src="cmd/sc_insertobjectstarmath.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149933" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3155858" xml-lang="en-US">Formula</paragraph>
 </tablecell>
 </tablerow>
@@ -128,11 +128,11 @@
 <section id="systarchart">
 <table id="tbl_id3147441">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3156005" xml-lang="en-US">
 <image id="img_id3153739" src="cmd/sc_drawchart.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153739" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3145749" xml-lang="en-US">Chart</paragraph>
 </tablecell>
 </tablerow>
@@ -145,10 +145,10 @@
 <section id="sygrafik">
 <table id="tbl_id3150032">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3145594" xml-lang="en-US"><image id="img_id3144764" src="cmd/lc_insertgraphic.png" width="0.222inch" height="0.222inch"><alt id="alt_id3144764" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3149960" xml-lang="en-US">Image</paragraph>
 </tablecell>
 </tablerow>
@@ -161,11 +161,11 @@
 <section id="syframe">
 <table id="tbl_id3153743">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3168607" xml-lang="en-US">
 <image id="img_id3147482" src="cmd/sc_insertobjectfloatingframe.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147482" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3148588" xml-lang="en-US">Floating Frame</paragraph>
 </tablecell>
 </tablerow>
@@ -176,11 +176,11 @@
 <section id="syfontworkgallery">
 <table id="tbl_id14038">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_idN10DDC" xml-lang="en-US">
 <image id="Graphic2" src="cmd/sc_fontworkgalleryfloater.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_idN10DD1" xml-lang="en-US">Fontwork Gallery</paragraph>
 </tablecell>
 </tablerow>
@@ -189,11 +189,11 @@
 <section id="sybasicshapes">
 <table id="">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_idN10EA9" xml-lang="en-US">
 <image id="Graphic3" src="cmd/sc_basicshapes.diamond.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_idN10ED8" xml-lang="en-US">Basic Shapes</paragraph>
 </tablecell>
 </tablerow>
@@ -202,11 +202,11 @@
 <section id="sysymbolshapes">
 <table id="">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_idN10EEE" xml-lang="en-US">
 <image id="Graphic4" src="cmd/sc_symbolshapes.smiley.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_idN10F1D" xml-lang="en-US">Symbol Shapes</paragraph>
 </tablecell>
 </tablerow>
@@ -215,11 +215,11 @@
 <section id="syblockarrows">
 <table id="">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_idN10F33" xml-lang="en-US">
 <image id="Graphic41" src="cmd/sc_arrowshapes.left-right-arrow.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_idN10F62" xml-lang="en-US">Block Arrows</paragraph>
 </tablecell>
 </tablerow>
@@ -228,11 +228,11 @@
 <section id="syflowcharts">
 <table id="">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_idN10F78" xml-lang="en-US">
 <image id="Graphic5" src="cmd/sc_flowchartshapes.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_idN10FA7" xml-lang="en-US">Flowcharts</paragraph>
 </tablecell>
 </tablerow>
@@ -241,11 +241,11 @@
 <section id="sycallouts">
 <table id="">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_idN10FBD" xml-lang="en-US">
 <image id="Graphic6" src="cmd/sc_calloutshapes.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_idN10FEC" xml-lang="en-US">Callouts</paragraph>
 </tablecell>
 </tablerow>
@@ -254,11 +254,11 @@
 <section id="systars">
 <table id="">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_idN11002" xml-lang="en-US">
 <image id="Graphic7" src="cmd/sc_starshapes.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_idN11031" xml-lang="en-US">Stars</paragraph>
 </tablecell>
 </tablerow>
diff --git a/source/text/shared/01/04050000.xhp b/source/text/shared/01/04050000.xhp
index 619f5ac2e..c749a03d3 100644
--- a/source/text/shared/01/04050000.xhp
+++ b/source/text/shared/01/04050000.xhp
@@ -1,88 +1,165 @@
 <?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="textshared0104050000xml" indexer="include">
-    <title id="tit" xml-lang="en-US">Comment</title>
-    <filename>/text/shared/01/04050000.xhp</filename>
-  </topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3154100">
-  <bookmark_value>comments;inserting/editing/deleting/printing</bookmark_value>
-  <bookmark_value>inserting; comments</bookmark_value>
-  <bookmark_value>editing; comments</bookmark_value>
-  <bookmark_value>deleting;comments</bookmark_value>
-  <bookmark_value>Navigator;comments</bookmark_value>
-  <bookmark_value>printing;comments</bookmark_value>
-  <bookmark_value>records; inserting comments </bookmark_value>
-  <bookmark_value>remarks, see also comments</bookmark_value>
-</bookmark>
-<comment>mw changed "notes;" and added 3 entries</comment>
-<section id="comment">
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertAnnotation" id="bm_id8906707" localize="false"/>
-<paragraph id="hd_id3154100" role="heading" level="1" xml-lang="en-US"><link href="text/shared/01/04050000.xhp">Comment</link></paragraph>
-  <paragraph id="par_id3151100" role="paragraph" xml-lang="en-US"><variable id="notizbearbeitentext"><ahelp hid=".">Inserts a comment around the selected text or at the current cursor position.</ahelp></variable></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00000404.xhp#notiz"/>
-</section>
-<paragraph id="hd_id9851680" role="heading" level="2" xml-lang="en-US">Inserting comments</paragraph><comment>issue 113019 112000</comment>
-  <paragraph id="par_id1830500" role="paragraph" xml-lang="en-US">In Writer, the command <item type="menuitem">Insert - Comment</item> or the <switchinline select="sys"><caseinline select="MAC"><emph>Command</emph>+<emph>Option</emph></caseinline><defaultinline><emph>Ctrl</emph>+<emph>Alt</emph></defaultinline></switchinline>+<emph>C</emph> key combination inserts a comment anchor at the current cursor position. A comment box is shown at the page margin, where you can enter the text of your comment. A line connects anchor and comment box. If a text range is selected, the comment is attached to the text range.</paragraph>
-  <paragraph id="par_id0915200910571516" role="paragraph" xml-lang="en-US">In Calc, Draw, and Impress, the command <item type="menuitem">Insert - Comment</item> inserts a comment.</paragraph>
-  <paragraph id="par_id1831" role="paragraph" xml-lang="en-US">The author name and the date and time of creating this comment is shown at the bottom of the comment box.</paragraph>
-  <paragraph id="par_id6718649" role="paragraph" xml-lang="en-US">The comments by different authors get different colors. Choose <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME - User Data</menuitem> to enter your name so that it can show up as the comment author.</paragraph>
-<paragraph id="hd_id2929166" role="heading" level="2" xml-lang="en-US">Editing comments</paragraph>
-  <paragraph id="par_id5201879" role="paragraph" xml-lang="en-US">Every user with write permission to the document can edit and delete comments of all authors.</paragraph>
-  <paragraph id="par_id2571794" role="paragraph" xml-lang="en-US">The comment box contains an icon with a down arrow. Click the icon to open a menu with some commands to delete comments.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:DeleteNote" id="bm_id0429200810584478" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:DeleteAnnotation" id="bm_id0915200910464881" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:DeleteComment" id="bm_id0429200810584479" localize="false"/>
-<paragraph id="par_id0522200809383431" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Delete the current comment.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:DeleteAuthor" id="bm_id0429200810592549" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:DeleteAllAnnotationByAuthor" id="bm_id0915200910471559" localize="false"/>
-<paragraph id="par_id0522200809383485" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Delete all comments by this author in the current document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:DeleteAllNotes" id="bm_id0429200810593994" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:DeleteAllAnnotation" id="bm_id0915200910474796" localize="false"/>
-<paragraph id="par_id0522200809383428" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Delete all comments in the current document.</ahelp></paragraph>
-<paragraph id="par_id1857051" role="paragraph" xml-lang="en-US">Choose a command to delete the current comment, or all comments from the same author as the current comment, or all comments in the document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:ReplyComment" id="bm_id0429200810593995" localize="false"/>
-<paragraph id="par_id0305200911090684" role="paragraph" xml-lang="en-US">If the comment in a text document was written by another author, there is a <emph>Reply</emph> command in the context menu. <ahelp hid=".">This command inserts a new comment adjacent to the comment to which you want to reply.</ahelp> The comment anchor is the same for both comments. Type your reply text in the new comment. Save and send your document to other authors, then those authors can add replies, too.</paragraph><comment>View - Comments command</comment>
-<bookmark xml-lang="en-US" branch="hid/.uno:ShowAnnotations" id="bm_id0804200803411260" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ShowNote" id="bm_id0804200803411261" localize="false"/>
-<paragraph id="par_id0804200803435883" role="paragraph" xml-lang="en-US"><ahelp hid=".">Use <item type="menuitem">View - Comments</item> to show or hide all comments.</ahelp></paragraph>
-<paragraph id="par_id0302200901430918" role="paragraph" xml-lang="en-US">In the <emph>Find & Replace</emph> dialog of text documents, you can select to include the comments texts in your searches.</paragraph>
-<paragraph id="hd_id3445539" role="heading" level="2" xml-lang="en-US">Navigating from comment to comment in text documents</paragraph>
-  <paragraph id="par_id4271370" role="paragraph" xml-lang="en-US">When the cursor is inside a comment, you can press <switchinline select="sys"><caseinline select="MAC"><emph>Command</emph>+<emph>Option</emph></caseinline><defaultinline><emph>Ctrl</emph>+<emph>Alt</emph></defaultinline></switchinline>+<emph>Page Down</emph> to jump to the next comment, or press <switchinline select="sys"><caseinline select="MAC"><emph>Command</emph>+<emph>Option</emph></caseinline><defaultinline><emph>Ctrl</emph>+<emph>Alt</emph></defaultinline></switchinline>+<emph>Page Up</emph> to jump to the previous comment.</paragraph>
-  <paragraph id="par_id2116153" role="paragraph" xml-lang="en-US">When the cursor is inside the normal text, press the above mentioned keys to jump to the next or previous comment anchor. You can also use the small <emph>Navigation</emph> window below the vertical scrollbar to jump from one comment anchor to the next comment anchor.</paragraph>
-  <paragraph id="par_id5381328" role="tip" xml-lang="en-US">You can also open the <emph>Navigator</emph> to see a list of all comments. Right-click a comment name in the Navigator to edit or delete the comment.</paragraph>
-<paragraph id="hd_id5664235" role="heading" level="2" xml-lang="en-US">Printing comments</paragraph>
-<paragraph id="par_id2254402" role="paragraph" xml-lang="en-US">To change the printing option for comments for all your text documents, choose <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME Writer - Print</menuitem>.</paragraph>
-<paragraph id="hd_id0915200910571612" role="heading" level="2" xml-lang="en-US">Comments in spreadsheets</paragraph>
-  <paragraph id="par_id3166460" role="paragraph" xml-lang="en-US">When you attach a comment to a cell, a callout appears where you can enter your text. A small square in the upper right corner of a cell marks the position of a comment. To display the comment permanently, right-click the cell, and choose <emph>Show Comment</emph>.</paragraph>
-  <paragraph id="par_id8336741" role="paragraph" xml-lang="en-US">To change the object properties of a comment, for example the background color, choose <emph>Show Comment</emph> as above, then right-click the comment. Do <emph>not</emph> double-click the text!</paragraph>
-  <paragraph id="par_id3155390" role="paragraph" xml-lang="en-US">To edit a shown comment, double-click the comment text. To edit a comment that is not shown permanently, right-click in the cell that contains the comment, and then choose <emph>Edit Comment</emph>. To specify the formatting of the comment text, right-click the comment text in edit mode.</paragraph>
-  <paragraph id="par_idN107A1" role="paragraph" xml-lang="en-US">To change the position or size of a comment, drag a border or corner of the comment.</paragraph>
-  <paragraph id="par_id9499496" role="paragraph" xml-lang="en-US">To delete a comment, right-click the cell, then choose <emph>Delete Comment</emph>.</paragraph>
-  <paragraph id="par_id2036805" role="paragraph" xml-lang="en-US">You can also right-click a comment name in the <emph>Navigator</emph> window to choose some editing commands.</paragraph>
-  <paragraph id="par_id3153716" role="paragraph" xml-lang="en-US">To set the printing options for comments in your spreadsheet, choose <emph>Format - Page</emph>, and then click the <emph>Sheet</emph> tab.</paragraph>
-  <paragraph id="par_id2419507" role="note" xml-lang="en-US">In Impress, you can choose to use the <emph>Notes view</emph> to write a page of notes for every slide. Additionally, you can insert comments to your slides.</paragraph>
+    <!--
+    * 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="textshared0104050000xml" indexer="include">
+            <title id="tit" xml-lang="en-US">Comments</title>
+            <filename>/text/shared/01/04050000.xhp</filename>
+        </topic>
+    </meta>
+    <body>
+    <bookmark xml-lang="en-US" branch="index" id="bm_id3154100">
+        <bookmark_value>comments;inserting/editing/deleting/printing</bookmark_value>
+        <bookmark_value>inserting; comments</bookmark_value>
+        <bookmark_value>editing; comments</bookmark_value>
+        <bookmark_value>deleting;comments</bookmark_value>
+        <bookmark_value>Navigator;comments</bookmark_value>
+        <bookmark_value>printing;comments</bookmark_value>
+        <bookmark_value>records; inserting comments </bookmark_value>
+        <bookmark_value>remarks, see also comments</bookmark_value>
+    </bookmark>
+    <comment>mw changed "notes;" and added 3 entries</comment>
+    <section id="comment">
+        <bookmark xml-lang="en-US" branch="hid/.uno:InsertAnnotation" id="bm_id8906707" localize="false"/>
+        <h1 id="hd_id3154100"><link href="text/shared/01/04050000.xhp">Comments</link></h1>
+        <paragraph id="par_id3151100" role="paragraph" xml-lang="en-US"><variable id="notizbearbeitentext"><ahelp hid=".">Inserts a comment around the selected text, presentation slide, drawing page or at the current spreadsheet cursor position.</ahelp></variable></paragraph>
+    </section>
+    <section id="howtoget">
+        <embed href="text/shared/00/00000404.xhp#notiz"/>
+        <embed href="text/shared/00/00000404.xhp#notizkbd"/>
+    </section>
+
+    <paragraph id="par_id6718649" role="paragraph" xml-lang="en-US">The comments by different authors get different colors. Choose <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME - User Data</menuitem> to enter your name so that it can show up as the comment author.</paragraph>
+    <switch select="appl">
+        <case select="CALC">
+            <h2 id="hd_id0915200910571612">Comments in spreadsheets</h2>
+            <paragraph id="par_id3166460" role="paragraph" xml-lang="en-US">When you attach a comment to a cell, a callout appears where you can enter your text. A small square in the upper right corner of a cell marks the position of a comment. To display the comment permanently, right-click the cell, and choose <emph>Show Comment</emph>.</paragraph>
+            <paragraph role="paragraph" id="par_id101565954872022" xml-lang="en-US">
+                <image src="media/helpimg/sc_cell_with_comment_displayed.png" id="img_id901565954872022" width="451px" height="173px"><alt xml-lang="en-US" id="alt_id771565954872022">Cell with comment displayed</alt></image>
+            </paragraph>
+            <paragraph id="par_id8336741" role="paragraph" xml-lang="en-US">To change the object properties of a comment, for example the background color, choose <emph>Show Comment</emph> as above, then right-click the comment. Do <emph>not</emph> double-click the text!</paragraph>
+            <paragraph id="par_id3155390" role="paragraph" xml-lang="en-US">To edit a shown comment, double-click the comment text. To edit a comment that is not shown permanently, right-click in the cell that contains the comment, and then choose <emph>Edit Comment</emph>. To specify the formatting of the comment text, right-click the comment text in edit mode.</paragraph>
+            <paragraph id="par_idN107A1" role="paragraph" xml-lang="en-US">To change the position or size of a comment, drag a border or corner of the comment box.</paragraph>
+            <paragraph id="par_id9499496" role="paragraph" xml-lang="en-US">To delete a comment, right-click the cell, then choose <emph>Delete Comment</emph>.</paragraph>
+
+            <paragraph id="par_id2036805" role="paragraph" xml-lang="en-US">You can also right-click a comment name in the <emph>Navigator</emph> window to choose some editing commands.</paragraph>
+
+            <paragraph id="par_id3153716" role="paragraph" xml-lang="en-US">To set the printing options for comments in your spreadsheet, choose <menuitem>Format - Page</menuitem>, and then click the <emph>Sheet</emph> tab.</paragraph>
+        </case>
+        <case select="IMPRESS">
+            <h2 id="hd_id1001565974085289">Inserting Comments in Presentations</h2>
+            <section id="comment001">
+                <paragraph role="paragraph" id="par_id901565974475262">Use the command <menuitem>Insert - Comment</menuitem> or the key combination above to insert a comment anchor to the current <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><caseinline select="DRAW">page</caseinline></switchinline>. A colored comment box is shown at the top left corner, to enter the text of the comment. A small colored box -  the anchor - in the top left of the <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><caseinline select="DRAW">page</caseinline></switchinline> contains the initials of the author name, followed by a sequential number. Click on the anchor to open or close the corresponding comment.</paragraph>
+
+                <paragraph role="paragraph" id="par_id521565974498192">The author name and the comment creation date and time is shown at the bottom of the comment box.</paragraph>
+                <paragraph id="par_id2571794" role="paragraph" xml-lang="en-US">The comment box contains an icon with a down arrow. Click the icon to open a menu with some commands to delete comments.</paragraph>
+                <paragraph id="par_id1857051" role="paragraph" xml-lang="en-US">Choose a command to delete the current comment, or all comments from the same author as the current comment, or all comments in the document.</paragraph>
+            </section>
+            <paragraph role="paragraph" id="par_id561345967371982" xml-lang="en-US">
+                <image src="media/helpimg/si_presentation_with_comment.png" id="img_id23465967371982" width="598px" height="291px"><alt xml-lang="en-US" id="alt_id481565967371982">Comments in Presentations</alt></image>
+            </paragraph>
+        </case>
+        <case select="DRAW">
+            <h2 id="hd_id491566054901283">Inserting Comments in Drawings</h2>
+            <embed href="text/shared/01/04050000.xhp#comment001"/>
+            <paragraph role="paragraph" id="par_id561345998371982" xml-lang="en-US">
+                <image src="media/helpimg/sd_drawing_with_comment.png" id="img_id23465967371982" width="413px" height="293px"><alt xml-lang="en-US" id="alt_id481565967371982">Comments in Drawings</alt></image>
+            </paragraph>
+        </case>
+        <default>
+            <h2 id="hd_id9851680">Inserting Comments in Text Documents</h2><comment>issue 113019 112000</comment>
+
+            <paragraph id="par_id1830500" role="paragraph" xml-lang="en-US">Use the command <menuitem>Insert - Comment</menuitem> or the <switchinline select="sys"><caseinline select="MAC"><emph>Command</emph>+<emph>Option</emph></caseinline><defaultinline><emph>Ctrl</emph>+<emph>Alt</emph></defaultinline></switchinline>+<emph>C</emph> key combination to insert a comment anchor at the current cursor position. A colored comment box is shown at the page margin, to enter the text of the comment. A line connects the anchor to the comment box. If a text range is selected, the comment is attached to the text range. The commented text range is shadowed.</paragraph>
+
+            <paragraph id="par_id1831" role="paragraph" xml-lang="en-US">The author name and the creation date and time of the comment is shown at the bottom of the comment box.</paragraph>
+
+            <paragraph role="paragraph" id="par_id561565967371982" xml-lang="en-US">
+                <image src="media/helpimg/sw_text_with_comment.png" id="img_id21565967371982" width="834px" height="244px"><alt xml-lang="en-US" id="alt_id481565967371982">Comments in text documents</alt></image>
+            </paragraph>
+
+            <h2 id="hd_id2929166">Editing comments</h2>
+
+            <paragraph id="par_id5201879" role="paragraph" xml-lang="en-US">Every user with write permission to the document can edit and delete comments of all authors.</paragraph>
+            <embed href="text/shared/01/04050000.xhp#dropdown"/>
+
+            <bookmark xml-lang="en-US" branch="hid/.uno:ReplyComment" id="bm_id0429200810593995" localize="false"/>
+            <paragraph id="par_id0305200911090684" role="paragraph" xml-lang="en-US">If the comment in a text document was written by another author, there is a <emph>Reply</emph> command in the context menu. <ahelp hid=".">This command inserts a new comment adjacent to the comment to which you want to reply.</ahelp> The comment anchor is the same for both comments. Type your reply text in the new comment. Save and send your document to other authors, then those authors can add replies, too.</paragraph><comment>View - Comments command</comment>
+
+            <tip id="par_id0302200901430918">In the <emph>Find & Replace</emph> dialog of text documents, you can select to include the comments texts in your searches.</tip>
+
+            <h2 id="hd_id3445539">Navigating from comment to comment in text documents</h2>
+
+            <paragraph id="par_id4271370" role="paragraph" xml-lang="en-US">When the cursor is inside a comment, you can press <switchinline select="sys"><caseinline select="MAC"><emph>Command</emph>+<emph>Option</emph></caseinline><defaultinline><emph>Ctrl</emph>+<emph>Alt</emph></defaultinline></switchinline>+<emph>Page Down</emph> to jump to the next comment, or press <switchinline select="sys"><caseinline select="MAC"><emph>Command</emph>+<emph>Option</emph></caseinline><defaultinline><emph>Ctrl</emph>+<emph>Alt</emph></defaultinline></switchinline>+<emph>Page Up</emph> to jump to the previous comment.</paragraph>
+
+            <paragraph id="par_id2116153" role="paragraph" xml-lang="en-US">When the cursor is inside the normal text, press the above mentioned keys to jump to the next or previous comment anchor. You can also use the small <emph>Navigation</emph> window below the vertical scrollbar to jump from one comment anchor to the next comment anchor.</paragraph>
+
+            <tip id="par_id5381328">You can also open the <emph>Navigator</emph> to see a list of all comments. Right-click a comment name in the Navigator to edit or delete the comment.</tip>
+
+        </default>
+    </switch>
+
+    <bookmark xml-lang="en-US" branch="hid/.uno:DeleteNote" id="bm_id0429200810584478" localize="false"/>
+    <bookmark xml-lang="en-US" branch="hid/.uno:DeleteAnnotation" id="bm_id0915200910464881" localize="false"/>
+    <bookmark xml-lang="en-US" branch="hid/.uno:DeleteComment" id="bm_id0429200810584479" localize="false"/>
+    <paragraph id="par_id0522200809383431" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Delete the current comment.</ahelp></paragraph>
+    <bookmark xml-lang="en-US" branch="hid/.uno:DeleteAuthor" id="bm_id0429200810592549" localize="false"/>
+    <bookmark xml-lang="en-US" branch="hid/.uno:DeleteAllAnnotationByAuthor" id="bm_id0915200910471559" localize="false"/>
+    <paragraph id="par_id0522200809383485" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Delete all comments by this author in the current document.</ahelp></paragraph>
+    <bookmark xml-lang="en-US" branch="hid/.uno:DeleteAllNotes" id="bm_id0429200810593994" localize="false"/>
+    <bookmark xml-lang="en-US" branch="hid/.uno:DeleteAllAnnotation" id="bm_id0915200910474796" localize="false"/>
+    <paragraph id="par_id0522200809383428" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Delete all comments in the current document.</ahelp></paragraph>
+
+    <h2 id="hd_id51565980483588">Viewing Comments</h2>
+    <bookmark xml-lang="en-US" branch="hid/.uno:ShowAnnotations" id="bm_id0804200803411260" localize="false"/>
+    <bookmark xml-lang="en-US" branch="hid/.uno:ShowNote" id="bm_id0804200803411261" localize="false"/>
+
+    <switch select="appl">
+        <case select="CALC">
+            <paragraph role="paragraph" id="par_id61565980600884">Use <menuitem>View - Comments</menuitem> to show or hide all comments in spreadsheets.</paragraph>
+        </case>
+        <case select="DRAW">
+            <paragraph role="paragraph" id="par_id171565980454842">Use <menuitem>View - Comments</menuitem> to show or hide all anchor comments on the top of the page.</paragraph>
+        </case>
+        <case select="IMPRESS">
+            <paragraph role="paragraph" id="par_id821565980437922">Use <menuitem>View - Comments</menuitem> to show or hide all anchor comments on the top of the slide.</paragraph>
+        </case>
+        <default>
+            <paragraph id="par_id0804200803435883" role="paragraph" xml-lang="en-US">Use <menuitem>View - Comments</menuitem> or click on the Comment button on the right of the horizontal ruler to show or hide all comments.</paragraph>
+        </default>
+    </switch>
+
+    <h2 id="hd_id5664235">Printing comments</h2>
+    <switch select="appl">
+        <case select="IMPRESS">
+            <paragraph role="paragraph" id="par_id231565982070288">You cannot print the comments of the slides.</paragraph>
+            <note id="par_id2419507">You can choose to use the <emph>Notes view</emph> to write a page of notes for every slide.</note>
+        </case>
+        <case select="DRAW">
+            <paragraph role="paragraph" id="par_id671565982126756">You cannot print the comments of the drawing pages.</paragraph>
+        </case>
+        <case select="CALC">
+            <paragraph role="paragraph" id="par_id461565984972664">Comments are printed when they are made visible.</paragraph>
+        </case>
+        <default>
+            <paragraph id="par_id2254402" role="paragraph" xml-lang="en-US">To change the printing option for comments for all your text documents, choose <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME Writer - Print</menuitem>.</paragraph>
+        </default>
+    </switch>
 </body>
 </helpdocument>


More information about the Libreoffice-commits mailing list