tdf#139667 update numbering paragraphs; joining lists; chapter numbering

( swriter/01/06060000.xhp )
+ variable to tip about using Chapter Numbering dialog
to add numbering to headings, so that it can be embedded
in other help pages.
+ add links in tip to Tools - Chapter Numbering and other
icons, toolbars, and dialogs mentioned in the tip.
+ Emphasize in the tip to use the Chapter Numbering dialog instead
of direct formatting, when adding numbering to Headings.

( swriter/guide/join_numbered_lists.xhp )
* "numbered" -> "ordered"
* "Numbering On/Off" -> "Toggle Ordered List"
* In paragraphs with changes, update to <menuitem>
+ add a <tip> about "Add to List", with link to
relevant page.
* update to <h1>,<h2>,<relatedtopics>

( swriter/guide/numbering_paras.xhp )
* "numbered" -> "ordered"
* replace tip about chapter numbering with embed from
swriter/01/06060000.xhp
* "Numbering On/Off" -> "No List"

Change-Id: I242bfef2535d5fbcd95355d79e77403ce0071679
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112518
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

3 files changed, 18 insertions, 17 deletions

diff --git a/source/text/swriter/01/06060000.xhp b/source/text/swriter/01/06060000.xhp
index 677c488e10..8fef88075c 100644
--- a/source/text/swriter/01/06060000.xhp
+++ b/source/text/swriter/01/06060000.xhp
@@ -39,7 +39,7 @@
 <embed href="text/swriter/00/00000406.xhp#kapitelnumerierung"/>
 </section>
 <paragraph id="par_id3150934" role="paragraph" xml-lang="en-US">Chapter numbering is linked to paragraph styles. By default, the "Heading" paragraph styles (1-10) are assigned to the corresponding chapter and outline number levels (1-10). If you want, you can assign different paragraph styles to the outline number level.</paragraph>
-<tip id="par_id8237250" xml-lang="en-US">If you want numbered headings, use the Chapter Numbering dialog. Do not use the <emph>Toggle Ordered List</emph> icon on the Formatting bar.</tip>
+<tip id="par_id8237250" xml-lang="en-US"><variable id="chapter_numbering_tip">If you want numbered headings, choose <menuitem>Tools - </menuitem><link name="chapternumbering" href="text/swriter/01/06060000.xhp#ChapNumh1"><menuitem>Chapter Numbering</menuitem></link>. This command opens a dialog where numbering schemes can be assigned to paragraph styles used for headings. Do not use the <link href="text/swriter/02/02110000.xhp" name="Toggle Ordered List">Toggle Ordered List</link> icon on the <link href="text/swriter/main0202.xhp" name="FormattingBar">Formatting Bar</link> or the <menuitem>Format - </menuitem><link href="text/shared/01/06050000.xhp" name="BulletsNumbering"><menuitem>Bullets and Numbering</menuitem></link> dialog.</variable></tip>
 <embed href="text/swriter/01/06060100.xhp#numbering"/>
 <embed href="text/shared/01/06050600.xhp#position_s"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumbering/user" id="bm_id3147506" localize="false"/>
diff --git a/source/text/swriter/guide/join_numbered_lists.xhp b/source/text/swriter/guide/join_numbered_lists.xhp
index 7fa6db49eb..f343d4a521 100644
--- a/source/text/swriter/guide/join_numbered_lists.xhp
+++ b/source/text/swriter/guide/join_numbered_lists.xhp
@@ -35,22 +35,21 @@
   <bookmark_value>paragraphs;numbering non-consecutive</bookmark_value>
 </bookmark>
 
+<h1 id="hd_id3150495" xml-lang="en-US"><variable id="join_numbered_lists"><link href="text/swriter/guide/join_numbered_lists.xhp" name="Combining Numbered Lists">Combining Ordered Lists</link></variable></h1>
+<paragraph id="par_id3149692" role="paragraph" xml-lang="en-US">You can combine two ordered lists into a single list.</paragraph>
 
-<paragraph id="hd_id3150495" role="heading" level="1" xml-lang="en-US"><variable id="join_numbered_lists"><link href="text/swriter/guide/join_numbered_lists.xhp" name="Combining Numbered Lists">Combining Numbered Lists</link></variable></paragraph>
-<paragraph id="par_id3149692" role="paragraph" xml-lang="en-US">You can combine numbered lists into a single consecutively numbered list.</paragraph>
-
-<paragraph id="hd_id3149452" role="heading" level="2" xml-lang="en-US">To Combine Consecutive Numbered Lists</paragraph>
+<h2 id="hd_id3149452" xml-lang="en-US">To Combine Two Ordered Lists</h2>
 
 <list type="ordered">
   <listitem>
     <paragraph id="par_id3154479" role="listitem" xml-lang="en-US">Select all of the paragraphs in the lists.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3155911" role="listitem" xml-lang="en-US">On the <item type="menuitem">Formatting</item> Bar, click the <item type="menuitem">Numbering On/Off</item> icon twice.</paragraph>
+    <paragraph id="par_id3155911" role="listitem" xml-lang="en-US">On the <menuitem>Formatting</menuitem> Bar, click the <menuitem>Toggle Ordered List</menuitem> icon twice.</paragraph>
   </listitem>
 </list>
 
-<paragraph id="hd_id3155870" role="heading" level="2" xml-lang="en-US">To Create a Numbered List From Non-consecutive Paragraphs:</paragraph>
+<h2 id="hd_id3155870" xml-lang="en-US">To Create a Ordered List From Non-consecutive Paragraphs</h2>
 
 <list type="ordered">
   <listitem>
@@ -60,16 +59,18 @@
     <paragraph id="par_id3149644" role="listitem" xml-lang="en-US">Continue to hold down <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline>, and drag a selection in each numbered paragraph of the lists you want to combine.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3145102" role="listitem" xml-lang="en-US">On the <item type="menuitem">Formatting</item> Bar, click the <item type="menuitem">Numbering On/Off</item> icon twice.</paragraph>
+    <paragraph id="par_id3145102" role="listitem" xml-lang="en-US">On the <menuitem>Formatting</menuitem> Bar, click the <menuitem>Toggle Ordered List</menuitem> icon twice.</paragraph>
   </listitem>
 </list>
-<embed href="text/shared/00/00000004.xhp#related"/>
+<tip id="par_id751615828987862">To add selected paragraphs to an existing list, use <link href="text/swriter/02/add_to_list.xhp" name="Add to List"><menuitem>Format - Lists - Add to List</menuitem></link>.</tip>
+<section id="relatedtopics">
 <embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
 <embed href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
 <embed href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
 <embed href="text/shared/guide/numbering_stop.xhp#numbering_stop"/>
 <embed href="text/swriter/guide/captions.xhp#captions"/>
 <embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
+</section>
 </body>
 
 </helpdocument>
diff --git a/source/text/swriter/guide/numbering_paras.xhp b/source/text/swriter/guide/numbering_paras.xhp
index 4bf7f70dee..ddf4c84e83 100644
--- a/source/text/swriter/guide/numbering_paras.xhp
+++ b/source/text/swriter/guide/numbering_paras.xhp
@@ -20,7 +20,7 @@
 
 <meta>
   <topic id="textswriterguidenumbering_parasxml" indexer="include" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">Modifying Numbering in a Numbered List</title>
+    <title id="tit" xml-lang="en-US">Modifying Numbering in an Ordered List</title>
     <filename>/text/swriter/guide/numbering_paras.xhp</filename>
   </topic>
 </meta>
@@ -37,11 +37,11 @@
 </bookmark>
 <comment>MW changed "removing;..." to "deleting;...", and deleted "modifying;..."</comment>
 
-<h1 id="hd_id3149637" xml-lang="en-US"><variable id="numbering_paras"><link href="text/swriter/guide/numbering_paras.xhp" name="Modifying Numbering in a Numbered List">Modifying Numbering in a Numbered List</link></variable></h1>
-<paragraph id="par_id3145092" role="paragraph" xml-lang="en-US">You can remove the numbering from a paragraph in a numbered list or change the number that a numbered list starts with.</paragraph>
-<tip id="par_id2172612" xml-lang="en-US">If you want numbered headings, use the <menuitem>Tools - Chapter Numbering</menuitem> menu command to assign a numbering to a paragraph style. Do not use the Numbering icon on the Formatting toolbar.</tip>
+<h1 id="hd_id3149637" xml-lang="en-US"><variable id="numbering_paras"><link href="text/swriter/guide/numbering_paras.xhp" name="Modifying Numbering in a Numbered List">Modifying Numbering in an Ordered List</link></variable></h1>
+<paragraph id="par_id3145092" role="paragraph" xml-lang="en-US">You can remove the numbering from a paragraph in an ordered list or change the number that an ordered list starts with.</paragraph>
+<embed href="text/swriter/01/06060000.xhp#chapter_numbering_tip"/>
 
-<h2 id="hd_id3145107" xml-lang="en-US">To Remove the Number From a Paragraph in a Numbered List</h2>
+<h2 id="hd_id3145107" xml-lang="en-US">To Remove the Number From a Paragraph in an Ordered List</h2>
 
 <list type="ordered">
   <listitem>
@@ -57,14 +57,14 @@
     <paragraph id="par_id3153390" role="listitem" xml-lang="en-US">To remove the number while preserving the indent of the paragraph, press the Backspace key.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3154248" role="listitem" xml-lang="en-US">To remove the number and the indent of the paragraph, click the <emph>Numbering on/off</emph> icon on the <emph>Formatting</emph> Bar. If you save the document in HTML format, a separate numbered list is created for the numbered paragraphs that follow the current paragraph.</paragraph>
+    <paragraph id="par_id3154248" role="listitem" xml-lang="en-US">To remove the number and the indent of the paragraph, click the <emph>No List</emph> icon on the <emph>Formatting</emph> Bar. If you save the document in HTML format, a separate numbered list is created for the numbered paragraphs that follow the current paragraph.</paragraph>
   </listitem></list>
 
-<h2 id="hd_id3154856" xml-lang="en-US">To Change the Number That a Numbered List Starts With</h2>
+<h2 id="hd_id3154856" xml-lang="en-US">To Change the Number That an Ordered List Starts With</h2>
 
 <list type="ordered">
   <listitem>
-    <paragraph id="par_id3155877" role="listitem" xml-lang="en-US">Click anywhere in the numbered list.</paragraph>
+    <paragraph id="par_id3155877" role="listitem" xml-lang="en-US">Click anywhere in the ordered list.</paragraph>
   </listitem>
   <listitem>
     <paragraph id="par_id3155895" role="listitem" xml-lang="en-US">Choose <menuitem>Format - Bullets and Numbering</menuitem>, and then click the <menuitem>Customize</menuitem> tab.</paragraph>