8 files changed, 83 insertions, 38 deletions
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 7d6e3b4f7f..5dfb8e87fc 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -346,6 +346,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/01/DeleteTable \
     helpcontent2/source/text/shared/01/digitalsignatures \
     helpcontent2/source/text/shared/01/digitalsignaturespdf \
+    helpcontent2/source/text/shared/01/DrawText \
     helpcontent2/source/text/shared/01/EntireCell \
     helpcontent2/source/text/shared/01/EntireColumn \
     helpcontent2/source/text/shared/01/EntireRow \
diff --git a/source/text/scalc/00/00000404.xhp b/source/text/scalc/00/00000404.xhp
index 599499f251..6badbd4001 100644
--- a/source/text/scalc/00/00000404.xhp
+++ b/source/text/scalc/00/00000404.xhp
@@ -166,7 +166,15 @@
 <paragraph role="paragraph" id="par_id3143222">Choose <menuitem>Sheet - Named Ranges and Expressions - Define</menuitem>.</paragraph>
 <paragraph role="paragraph" id="par_id3149385"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F3</paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3145214"><variable id="einaei">Choose <menuitem>Sheet - Named Ranges and Expressions - Insert</menuitem>.</variable></paragraph>
+
+<section id="insertnames">
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph role="paragraph" id="par_id721698845208326">Choose <menuitem>Insert - Named Ranges and Expressions</menuitem>.</paragraph>
+  <paragraph role="paragraph" id="par_id3145214"><variable id="einaei">Choose <menuitem>Sheet - Named Ranges and Expressions - Insert</menuitem>.</variable></paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+  <paragraph role="paragraph" id="par_id21698845324130">On the <menuitem>Insert</menuitem> menu of the <menuitem>Insert</menuitem> tab, choose <menuitem>Named Ranges and Expressions</menuitem>.</paragraph>
+</section>
+
 <paragraph role="paragraph" id="par_id3153558"><variable id="einaueb">Choose <menuitem>Sheet - Named Ranges and Expressions - Create</menuitem>.</variable></paragraph>
 <paragraph role="paragraph" id="par_id3153483"><variable id="einabesch">Choose <menuitem>Sheet - Named Ranges and Expressions - Labels</menuitem>.</variable></paragraph>
 </body>
diff --git a/source/text/scalc/01/04070000.xhp b/source/text/scalc/01/04070000.xhp
index 9ffd90064d..af57b50a4d 100644
--- a/source/text/scalc/01/04070000.xhp
+++ b/source/text/scalc/01/04070000.xhp
@@ -19,7 +19,7 @@
 <helpdocument version="1.0">
 <meta>
 <topic id="textscalc0104070000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Named Ranges and Expressions</title>
+<title id="tit">Named Ranges and Expressions</title>
 <filename>/text/scalc/01/04070000.xhp</filename>
 </topic>
 <history>
@@ -28,9 +28,9 @@
 </meta>
 <body>
 <section id="namen">
-<bookmark xml-lang="en-US" branch="hid/.uno:NamesMenu" id="bm_id2043214" localize="false"/>
+<bookmark branch="hid/.uno:NamesMenu" id="bm_id2043214" localize="false"/>
 <h1 id="hd_id3153951"><link href="text/scalc/01/04070000.xhp">Named Ranges and Expressions</link></h1>
-<paragraph role="paragraph" id="par_id3145801" xml-lang="en-US"><ahelp hid=".">Allows you to name the different sections of your spreadsheet document.</ahelp> By naming the different sections, you can easily <link href="text/scalc/01/02110000.xhp">navigate</link> through the spreadsheet documents and find specific information.</paragraph>
+<paragraph role="paragraph" id="par_id3145801"><ahelp hid=".">Allows you to name the different sections of your spreadsheet document.</ahelp> By naming the different sections, you can easily <link href="text/scalc/01/02110000.xhp">navigate</link> through the spreadsheet documents and find specific information.</paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/scalc/00/00000404.xhp#einamen"/>
diff --git a/source/text/scalc/01/04070200.xhp b/source/text/scalc/01/04070200.xhp
index 383068705d..d634bae21a 100644
--- a/source/text/scalc/01/04070200.xhp
+++ b/source/text/scalc/01/04070200.xhp
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,11 +16,10 @@
  *   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="textscalc0104070200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Paste Names</title>
+<title id="tit">Paste Names</title>
 <filename>/text/scalc/01/04070200.xhp</filename>
 </topic>
 <history>
@@ -30,30 +27,33 @@
 </history>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153195"><bookmark_value>cell ranges; inserting named ranges</bookmark_value>
+<bookmark branch="index" id="bm_id3153195"><bookmark_value>cell ranges; inserting named ranges</bookmark_value>
 <bookmark_value>inserting; cell ranges</bookmark_value> <bookmark_value>pasting; cell ranges</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertName" id="bm_id3154910" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/insertname/InsertNameDialog" id="bm_id3154910" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/insertname/@@nowidget@@" id="bm_id3154910" localize="false"/>
-<h1 id="hd_id3153195">Paste Names</h1>
-<paragraph role="paragraph" id="par_id3150011" xml-lang="en-US"><variable id="nameneinfuegentext"><ahelp hid=".uno:InsertName">Inserts a defined named cell range at the current cursor's position.</ahelp>
-</variable></paragraph>
-<paragraph role="note" id="par_id3149412" xml-lang="en-US">You can only insert a cell area after having defined a name for the area.</paragraph>
+<bookmark branch="hid/.uno:InsertName" id="bm_id3154910" localize="false"/>
+<bookmark branch="hid/modules/scalc/ui/insertname/InsertNameDialog" id="bm_id3154910" localize="false"/>
+<bookmark branch="hid/modules/scalc/ui/insertname/@@nowidget@@" id="bm_id3154910" localize="false"/>
+
+<section id="insertname">
+  <h1 id="hd_id3153195"><variable id="h1"><link href="text/scalc/01/04070200.xhp">Named Range or Expression</link></variable></h1>
+  <paragraph role="paragraph" id="par_id3150011"><variable id="nameneinfuegentext"><ahelp hid=".uno:InsertName">Inserts a defined named cell range at the current cursor's position with the <emph>Paste Names</emph> dialog.</ahelp></variable></paragraph>
+</section>
+<note id="par_id3149412">You can only insert a cell area after having defined a name for the area.</note>
+
 <section id="howtoget">
-  <embed href="text/scalc/00/00000404.xhp#einaei"/>
+  <embed href="text/scalc/00/00000404.xhp#insertnames"/>
 </section>
 
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/insertname/ctrl" id="bm_id3155415" localize="false"/>
+<bookmark branch="hid/modules/scalc/ui/insertname/ctrl" id="bm_id3155415" localize="false"/>
 <h2 id="hd_id3153160">Table area</h2>
-<paragraph role="paragraph" id="par_id3154944" xml-lang="en-US"><ahelp hid="modules/scalc/ui/insertname/ctrl">Lists all defined cell areas. Double-click an entry to insert the named area into the active sheet at the current cursor position.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154944"><ahelp hid="modules/scalc/ui/insertname/ctrl">Lists all defined cell areas. Double-click an entry to insert the named area into the active sheet at the current cursor position.</ahelp></paragraph>
 
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/insertname/pasteall" id="bm_id3153707" localize="false"/>
+<bookmark branch="hid/modules/scalc/ui/insertname/pasteall" id="bm_id3153707" localize="false"/>
 <h2 id="hd_id3153418">Paste All</h2>
-<paragraph role="paragraph" id="par_id3155066" xml-lang="en-US"><ahelp hid="modules/scalc/ui/insertname/pasteall">Inserts a list of all named areas and the corresponding cell references at the current cursor position.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155066"><ahelp hid="modules/scalc/ui/insertname/pasteall">Inserts a list of all named areas and the corresponding cell references at the current cursor position.</ahelp></paragraph>
 
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/insertname/paste" id="bm_id3153708" localize="false"/>
+<bookmark branch="hid/modules/scalc/ui/insertname/paste" id="bm_id3153708" localize="false"/>
 <h2 id="hd_id3153419">Paste</h2>
-<paragraph role="paragraph" id="par_id3155067" xml-lang="en-US"><ahelp hid="modules/scalc/ui/insertname/paste">Inserts the selected named area and the corresponding cell reference at the current cursor position.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155067"><ahelp hid="modules/scalc/ui/insertname/paste">Inserts the selected named area and the corresponding cell reference at the current cursor position.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/scalc/main0104.xhp b/source/text/scalc/main0104.xhp
index fbf70fb7d7..48146a6ae6 100644
--- a/source/text/scalc/main0104.xhp
+++ b/source/text/scalc/main0104.xhp
@@ -40,10 +40,9 @@
 <embed href="text/shared/01/04150000.xhp#object_submenu"/>
 <embed href="text/shared/menu/insert_shape.xhp#shape_submenu"/>
 <embed href="text/scalc/01/04060000.xhp#function_wizard"/>
-<embed href="text/scalc/01/04070000.xhp#namen"/>
+<embed href="text/scalc/01/04070200.xhp#insertname"/>
+<embed href="text/shared/01/DrawText.xhp#drawtext"/>
 
-<h2 id="hd_id491577295028949" localize="false"><embedvar href="text/shared/02/01140000.xhp#textbox_title"/></h2>
-<paragraph role="paragraph" id="par_id501577295147605" localize="false"><embedvar href="text/shared/02/01140000.xhp#textbox_text"/></paragraph>
 
 <embed href="text/shared/01/04050000.xhp#comment"/>
 <h2 id="hd_id3147003"><link href="text/shared/01/04160500.xhp">Floating Frame</link></h2>
diff --git a/source/text/shared/00/00000404.xhp b/source/text/shared/00/00000404.xhp
index 09f0d412de..517e31e7a0 100644
--- a/source/text/shared/00/00000404.xhp
+++ b/source/text/shared/00/00000404.xhp
@@ -25,6 +25,24 @@
 </meta>
 <body>
 <h1 id="hd_id3156324">Insert Menu</h1>
+<section id="drawtext">
+    <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+    <paragraph role="paragraph" id="par_id931698849059781">Choose <menuitem>Insert - Text Box</menuitem>.</paragraph>
+    <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+    <paragraph role="paragraph" id="par_id61698849086409">Choose <menuitem>Insert - Text Box</menuitem>.</paragraph>
+    <paragraph role="paragraph" id="par_id671698849081876">On the <menuitem>Insert</menuitem> menu of the <menuitem>Insert</menuitem> tab, choose <menuitem>Text Box</menuitem>.</paragraph>
+    <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+    <table id="tab_id261698848907253">
+        <tablerow>
+            <tablecell>
+                <paragraph id="par_id71698848907254" role="paragraph"><image src="cmd/lc_text.svg" id="img_id211698848907255" width="1cm"  height="1cm"><alt id="alt_id761698848907256">Icon Text Box</alt></image></paragraph>
+            </tablecell>
+            <tablecell>
+                <paragraph id="par_id591698848907258" role="paragraph">Text Box</paragraph>
+            </tablecell>
+        </tablerow>
+    </table>
+</section>
 <section id="insert_rows_before">
     <switch select="appl">
         <case select="WRITER">
diff --git a/source/text/shared/01/DrawText.xhp b/source/text/shared/01/DrawText.xhp
new file mode 100644
index 0000000000..012c08141f
--- /dev/null
+++ b/source/text/shared/01/DrawText.xhp
@@ -0,0 +1,30 @@
+<?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="textshared01DrawTextxhp" indexer="include" status="PUBLISH">
+            <title id="tit">Text Box</title>
+            <filename>/text/shared/01/DrawText.xhp</filename>
+        </topic>
+    </meta>
+<body>
+
+<bookmark branch="hid/.uno:DrawText" id="bm_id191698848385609" localize="false"/>
+<section id="drawtext">
+    <h1 id="hd_id681698848446526"><variable id="h1"><link href="text/shared/01/DrawText.xhp">Text Box</link></variable></h1>
+    <paragraph id="par_id3154657" role="paragraph"><variable id="textbox_text"><ahelp hid=".uno:DrawText">Draws a text box with horizontal text direction where you drag in the current document. Drag a text box to the size you want anywhere in the document, and then type or paste your text. Rotate the text box to get rotated text.</ahelp></variable></paragraph>
+</section>
+<section id="howtoget">
+    <embed href="text/shared/00/00000404.xhp#drawtext"/>
+</section>
+
+</body>
+</helpdocument>
diff --git a/source/text/shared/02/01140000.xhp b/source/text/shared/02/01140000.xhp
index 5526e81671..11bf83a418 100644
--- a/source/text/shared/02/01140000.xhp
+++ b/source/text/shared/02/01140000.xhp
@@ -190,18 +190,7 @@
   </tablerow>
 </table>
 
-<bookmark branch="hid/.uno:DrawText" id="bm_id8730699" localize="false"/>
-<h2 id="hd_id3145150"><variable id="textbox_title">Text Box</variable></h2>
-<table id="tbl_id3150297">
-  <tablerow>
-    <tablecell>
-      <paragraph id="par_id3145790" role="paragraph"><image id="img_id3155608" src="cmd/lc_text.svg" width="1cm" height="1cm"><alt id="alt_id3155608">Icon Text Box</alt></image></paragraph>
-    </tablecell>
-    <tablecell>
-      <paragraph id="par_id3154657" role="paragraph"><variable id="textbox_text"><ahelp hid=".uno:DrawText">Draws a text box with horizontal text direction where you drag in the current document. Drag a text box to the size you want anywhere in the document, and then type or paste your text. Rotate the text box to get rotated text.</ahelp></variable></paragraph>
-    </tablecell>
-  </tablerow>
-</table>
+<embed href="text/shared/01/DrawText.xhp#drawtext"/>
 
 <bookmark branch="hid/.uno:Text_Marquee" id="bm_id9847340" localize="false"/>
 <h2 id="hd_id3158214">Text Animation</h2>