tdf#137281, tdf#153549 clarify use of heading and chapter

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

4 files changed, 29 insertions, 20 deletions

diff --git a/source/text/swriter/00/00000405.xhp b/source/text/swriter/00/00000405.xhp
index 77872be7bc..a4bd11e6a6 100644
--- a/source/text/swriter/00/00000405.xhp
+++ b/source/text/swriter/00/00000405.xhp
@@ -58,7 +58,7 @@
          <paragraph role="paragraph" id="par_id231616224233651">Right-click a paragraph, choose <menuitem>Paragraph - Paragraph - Outline &amp; List</menuitem> tab.</paragraph>
   <paragraph role="paragraph" id="par_id41616224423602">Right-click a paragraph, choose <menuitem>Paragraph - Edit Style - Outline &amp; List</menuitem> tab.</paragraph>
          <paragraph xml-lang="en-US" id="par_id3154413" role="paragraph">Choose <menuitem>Styles - Edit Style - Outline &amp; List</menuitem> tab (Paragraph Styles).</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3147525" role="paragraph">Choose <menuitem>View - Styles -</menuitem> open context menu <menuitem>Modify/New - List &amp; Numbering</menuitem> tab (Paragraph Styles).</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147525" role="paragraph">Choose <menuitem>View - Styles -</menuitem> open context menu <menuitem>Modify/New - Outline &amp; List</menuitem> tab (Paragraph Styles).</paragraph>
       </section>
       <paragraph xml-lang="en-US" id="par_id3152960" role="paragraph"><variable id="spaltenber">Choose <menuitem>Format - Sections - Options</menuitem> button.</variable></paragraph>
       <section id="columns">
diff --git a/source/text/swriter/01/05030800.xhp b/source/text/swriter/01/05030800.xhp
index 380f1f2428..aef1484fa7 100644
--- a/source/text/swriter/01/05030800.xhp
+++ b/source/text/swriter/01/05030800.xhp
@@ -37,10 +37,10 @@
       </section>
       <list type="ordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3153536" role="listitem">To change the numbering options for paragraphs that use the same paragraph style, choose <menuitem>View - Styles</menuitem>, and then click the <emph>Paragraph Styles</emph> icon. Right-click the style in the list, choose <emph>Modify</emph>, and then click the <emph>Outline &amp; Numbering</emph> tab.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3153536" role="listitem">To change the numbering options for paragraphs that use the same paragraph style, choose <menuitem>View - Styles</menuitem>, and then click the <emph>Paragraph Styles</emph> icon. Right-click the style in the list, choose <emph>Modify</emph>, and then click the <menuitem>Outline &amp; List</menuitem> tab.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3154470" role="listitem">To change the numbering options for selected paragraphs, choose <menuitem>Format - </menuitem><link href="text/shared/01/05030000.xhp"><menuitem>Paragraph</menuitem></link>, and then click the <emph>Outline &amp; Numbering</emph> tab.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3154470" role="listitem">To change the numbering options for selected paragraphs, choose <menuitem>Format - </menuitem><link href="text/shared/01/05030000.xhp"><menuitem>Paragraph</menuitem></link>, and then click the <menuitem>Outline &amp; List</menuitem> tab.</paragraph>
          </listitem>
       </list>
 
@@ -56,9 +56,9 @@
       <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/numparapage/editnumstyle" id="bm_id3154201" localize="false"/>
 <h3 xml-lang="en-US" id="hd_id3154189">Edit Style</h3>
       <paragraph xml-lang="en-US" id="par_id3155179" role="paragraph"><ahelp hid="modules/swriter/ui/numparapage/editnumstyle">Edit the properties of the selected list style.</ahelp> These properties will apply to all paragraphs formatted with the given list style.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3149195" role="paragraph">This button is disabled when Chapter Numbering is applied. Choose <emph>Tools - Chapter Numbering</emph> to edit the outline level and numbering format.</paragraph>
-<note xml-lang="en-US" id="par_id3151117">Outline level and List style are independent of each other. Use <emph>Tools - Chapter Numbering</emph> to assign a numbering format to paragraph styles used as headings in a document outline structure.</note>
-      <paragraph xml-lang="en-US" id="par_id3149106" role="paragraph">This section only appears when you edit the properties of the current paragraph by choosing <emph>Format - Paragraph</emph>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149195" role="paragraph">This button is disabled when Heading Numbering is applied. Choose <menuitem>Tools - Heading Numbering</menuitem> to edit the outline level and numbering format.</paragraph>
+<note xml-lang="en-US" id="par_id3151117">Outline level and List style are independent of each other. Use <menuitem>Tools - Heading Numbering</menuitem> to assign a numbering format to paragraph styles used as headings in a document outline structure.</note>
+      <paragraph xml-lang="en-US" id="par_id3149106" role="paragraph">The next three options only appear when you edit the properties of a selected paragraph by choosing <menuitem>Format - Paragraph</menuitem>.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/numparapage/checkCB_NEW_START" id="bm_id3151262" localize="false"/>
 <h3 xml-lang="en-US" id="hd_id3151250">Restart numbering at this paragraph</h3>
       <paragraph xml-lang="en-US" id="par_id3154831" role="paragraph"><ahelp hid="modules/swriter/ui/numparapage/checkCB_NEW_START">Restarts the numbering at the current paragraph.</ahelp></paragraph>
diff --git a/source/text/swriter/guide/arrange_chapters.xhp b/source/text/swriter/guide/arrange_chapters.xhp
index 59d74cd7ab..8bdf7baf37 100644
--- a/source/text/swriter/guide/arrange_chapters.xhp
+++ b/source/text/swriter/guide/arrange_chapters.xhp
@@ -38,8 +38,8 @@
 <bookmark_value>outlines;arranging chapters</bookmark_value>
 </bookmark>
 
-<h1 id="hd_id3149973"><variable id="arrange_chapters"><link href="text/swriter/guide/arrange_chapters.xhp">Arranging Chapters in the Navigator</link> </variable></h1>
-<paragraph id="par_id3147795" role="paragraph" xml-lang="en-US">You can move headings and subordinate text up and down in a document by using the Navigator. You can also promote and demote outline levels for headings. To use this feature, format the headings in your document with one of the predefined heading paragraph styles. To use a custom paragraph style for a heading, choose <menuitem>Tools - Chapter Numbering</menuitem>, select the style in the <emph>Paragraph Style</emph> box, and then double-click a number in the <menuitem>Levels</menuitem> list.</paragraph>
+<h1 id="hd_id3149973"><variable id="arrange_chapters"><link href="text/swriter/guide/arrange_chapters.xhp">Arranging Headings in the Navigator</link> </variable></h1>
+<paragraph id="par_id3147795" role="paragraph" xml-lang="en-US">You can move <link href="text/shared/00/00000005.xhp#heading">headings</link> and subordinate text up and down in a document by using the Navigator. You can also promote and demote outline levels for headings. To use this feature, format the headings in your document with one of the predefined “Heading N” (1–10) paragraph styles, or to use a custom paragraph style for a heading, choose <menuitem>Tools - </menuitem><link href="text/swriter/01/06060000.xhp">Heading Numbering</link>, select a number in the <menuitem>Levels</menuitem> list, then select the style in the <emph>Paragraph Style</emph> box.</paragraph>
 <tip id="par_id3145652">To quickly move the text cursor to a heading in the document, double-click the heading in the <emph>Navigator</emph> list.</tip>
 <paragraph id="par_id3155461" role="paragraph" xml-lang="en-US">To dock the <emph>Navigator</emph>, drag the title bar to the edge of the workspace. To undock the <emph>Navigator</emph>, double-click its frame while holding the <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> key.</paragraph>
 
@@ -80,7 +80,7 @@
 </list>
 
 <h3 id="hd_id3155525">Use Outline Levels to Change which Headings Are Displayed</h3>
-<paragraph id="par_id3151352" role="paragraph" xml-lang="en-US">Click the <menuitem>Outline Levels Shown</menuitem> icon <image id="img_id3151310" src="sw/res/sc20236.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3151310">Icon Outline Levels Shown</alt></image>, and then select a number for the maximum outline level. Any heading with an outline level less than or equal to this number will be displayed in Navigator.</paragraph>
+<paragraph id="par_id3151352" role="paragraph" xml-lang="en-US">Click the <menuitem>Show Up to Outline Level</menuitem> icon <image id="img_id3151310" src="sw/res/sc20236.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3151310">Icon Show Up to Outline Level</alt></image>, and then select a number for the maximum outline level. Any heading with an outline level less than or equal to this number will be displayed in Navigator.</paragraph>
 
 <section id="relatedtopics">
 <embed href="text/shared/guide/navigator.xhp#navigator"/>
diff --git a/source/text/swriter/guide/chapter_numbering.xhp b/source/text/swriter/guide/chapter_numbering.xhp
index 5f0e773beb..ac662698df 100644
--- a/source/text/swriter/guide/chapter_numbering.xhp
+++ b/source/text/swriter/guide/chapter_numbering.xhp
@@ -20,7 +20,7 @@
 
 <meta>
   <topic id="textswriterguidechapter_numberingxml" indexer="include" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">Chapter Numbering</title>
+    <title id="tit" xml-lang="en-US">Numbering for Headings</title>
     <filename>/text/swriter/guide/chapter_numbering.xhp</filename>
   </topic>
 </meta>
@@ -37,24 +37,27 @@
 </bookmark>
 <comment>MW changed "removing;..." to "deleting;..." and made "outline numbering" a two level entry</comment>
 
-<h1 id="hd_id3147682" xml-lang="en-US"><variable id="chapter_numbering"><link href="text/swriter/guide/chapter_numbering.xhp">Chapter Numbering</link></variable></h1>
-<paragraph id="par_id3155605" role="paragraph" xml-lang="en-US">You can modify the heading hierarchy or assign a level in the hierarchy to a custom paragraph style. You can also add chapter and section numbering to heading paragraph styles. By default, the "Heading 1" paragraph style is at the top of the chapter hierarchy.</paragraph>
+<h1 id="hd_id3147682" xml-lang="en-US"><variable id="chapter_numbering"><link href="text/swriter/guide/chapter_numbering.xhp">Numbering for Headings</link></variable></h1>
+<paragraph id="par_id3155605" role="paragraph" xml-lang="en-US">Use the <link href="text/swriter/01/06060000.xhp"><menuitem>Heading Numbering</menuitem></link> dialog to add numbering to <link href="text/shared/00/00000005.xhp#heading">headings</link>. The different levels in the dialog enable you to assign different headings as an outline structure for your document. In the default settings, the “Heading 1” paragraph style is assigned outline level 1. It is considered to be the top level in the document outline structure. The “Heading 2” paragraph style is assigned outline level 2, and so forth. You can also use the dialog to assign a custom paragraph style as a heading in the document structure.</paragraph>
 
-<h2 id="hd_id3155626" xml-lang="en-US">To Add Automatic Numbering to a Heading Style</h2>
+<h2 id="hd_id3155626" xml-lang="en-US">To Add Automatic Numbering to a Heading</h2>
 
 <list type="ordered">
   <listitem>
-    <paragraph id="par_id3154255" role="listitem" xml-lang="en-US">Choose <menuitem>Tools - Chapter Numbering</menuitem>, and then click the <menuitem>Numbering</menuitem> tab.</paragraph>
+    <paragraph id="par_id3154255" role="listitem" xml-lang="en-US">Choose <menuitem>Tools - Heading Numbering</menuitem>, and then click the <menuitem>Numbering</menuitem> tab.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3155891" role="listitem" xml-lang="en-US">In the <menuitem>Paragraph style</menuitem> box, select the heading style that you want to add chapter numbers to.</paragraph>
+    <paragraph id="par_id911677925566575" role="listitem">Select the <menuitem>Level</menuitem> to configure.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3150513" role="listitem" xml-lang="en-US">In the <menuitem>Number</menuitem> box, select the numbering scheme that you want to use, and then click <menuitem>OK</menuitem>.</paragraph>
+    <paragraph id="par_id3155891" role="listitem" xml-lang="en-US">In the <menuitem>Paragraph style</menuitem> box, select the paragraph style for the selected level.</paragraph>
+  </listitem>
+  <listitem>
+    <paragraph id="par_id3150513" role="listitem" xml-lang="en-US">In the <menuitem>Number</menuitem> box, select the numbering scheme that you want to use for that heading, then click <widget>OK</widget>.</paragraph>
   </listitem>
 </list>
 
-<h2 id="par_idN107CE" xml-lang="en-US">To Remove Automatic Chapter Numbering From a Heading Paragraph</h2>
+<h2 id="par_idN107CE" xml-lang="en-US">To Remove Automatic Chapter Numbering From a Heading</h2>
 
 <list type="ordered">
   <listitem>
@@ -63,16 +66,21 @@
   <listitem>
     <paragraph id="par_idN107D9" role="listitem" xml-lang="en-US">Press the <keycode>Backspace</keycode> key to delete the number.</paragraph>
   </listitem>
+  <listitem>
+      <paragraph id="par_id441614161571912" role="listitem">Press <keycode>Shift+Backspace</keycode> with the cursor at the beginning of the heading to return the number.</paragraph>
+  </listitem>
 </list>
-<note id="par_id441614161571912">Press <keycode>Shift+Backspace</keycode> with the cursor at the beginning of the heading to return the number.</note>
+  
+<paragraph role="paragraph" id="par_id651677926469286">This procedure removes the numbering for an individual heading. To remove or modify the automatic numbering for all headings, use the <menuitem>Heading Numbering</menuitem> dialog .</paragraph>
+
 <h2 id="hd_id3155552" xml-lang="en-US">To Use a Custom Paragraph Style as a Heading</h2>
 
 <list type="ordered">
   <listitem>
-    <paragraph id="par_id3155571" role="listitem" xml-lang="en-US">Choose <item type="menuitem">Tools - Chapter Numbering</item>, and then click the <item type="menuitem">Numbering</item> tab.</paragraph>
+    <paragraph id="par_id3155571" role="listitem" xml-lang="en-US">Choose <menuitem>Tools - Heading Numbering</menuitem>, and then click the <menuitem>Numbering</menuitem> tab.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3147782" role="listitem" xml-lang="en-US">Click the heading level that you want to assign to the custom paragraph style in the <item type="menuitem">Level</item> list.</paragraph>
+    <paragraph id="par_id3147782" role="listitem" xml-lang="en-US">Click the level that you want to assign to the custom paragraph style in the <menuitem>Level</menuitem> list.</paragraph>
   </listitem>
   <listitem>
     <paragraph id="par_id3147758" role="listitem" xml-lang="en-US">Select the custom style in the <emph>Paragraph Style</emph> box.</paragraph>
@@ -83,6 +91,7 @@
 </list>
 <section id="relatedtopics">
 <embed href="text/swriter/guide/arrange_chapters.xhp#arrange_chapters"/>
+<embed href="text/swriter/01/06060000.xhp#ChapNumh1"/>
 </section>
 </body>