tdf#92825 adjust navigation to indexes and tables of contents

Change-Id: I144816d4cd81ba85f57f7e62ebf914de56d82a81
Reviewed-on: https://gerrit.libreoffice.org/22842
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

15 files changed, 45 insertions, 46 deletions

diff --git a/source/text/swriter/00/00000404.xhp b/source/text/swriter/00/00000404.xhp
index b2561dd475..0c20df8b21 100644
--- a/source/text/swriter/00/00000404.xhp
+++ b/source/text/swriter/00/00000404.xhp
@@ -180,10 +180,10 @@
 </section>
 <paragraph role="paragraph" id="par_id3150113" xml-lang="en-US" l10n="U" oldref="15"><variable id="einfscript">Choose <emph>Insert - Script</emph> (only HTML documents) 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155866" xml-lang="en-US" l10n="U" oldref="16"><variable id="verzeichnisseeinf">Choose <emph>Insert - Indexes and Tables</emph>
+<paragraph role="paragraph" id="par_id3155866" xml-lang="en-US"><variable id="verzeichnisseeinf">Choose <emph>Insert - Table of Contents and Index</emph>
 </variable></paragraph>
 <section id="eintragverz">
-<paragraph role="paragraph" id="par_id3147471" xml-lang="en-US" l10n="U" oldref="17">Choose <emph>Insert - Indexes and Tables - Entry</emph>
+<paragraph role="paragraph" id="par_id3147471" xml-lang="en-US">Choose <emph>Insert - Table of Contents and Index - Index Entry</emph>
 </paragraph>
 <paragraph role="paragraph" id="par_id3147490" xml-lang="en-US" l10n="CHG" oldref="18">Open <emph>Insert</emph> toolbar, click</paragraph>
 <section id="syeintrag">
@@ -202,52 +202,51 @@
 
 </section>
 </section>
-<paragraph role="paragraph" id="par_id3149217" xml-lang="en-US" l10n="U" oldref="20"><variable id="stichwortverzeichnisverz">Choose <emph>Insert - Indexes and Tables - Indexes and Tables</emph>
+<paragraph role="paragraph" id="par_id3149217" xml-lang="en-US"><variable id="stichwortverzeichnisverz">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3156225" xml-lang="en-US" l10n="U" oldref="21"><variable id="inhaltsverz">Choose <emph>Insert - Indexes and Tables - Bibliography Entry</emph>
+<paragraph role="paragraph" id="par_id3156225" xml-lang="en-US"><variable id="inhaltsverz">Choose <emph>Insert - Table of Contents and Index - Bibliography Entry</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147745" xml-lang="en-US" l10n="U" oldref="22"><variable id="benutzerverz">Choose <emph>Insert - Indexes and Tables - Indexes and Tables</emph>
+<paragraph role="paragraph" id="par_id3147745" xml-lang="en-US"><variable id="benutzerverz">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3146342" xml-lang="en-US" l10n="U" oldref="67"><variable id="stichwortverzeichnisverz1">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Index/Table</emph> tab 
+<paragraph role="paragraph" id="par_id3146342" xml-lang="en-US"><variable id="stichwortverzeichnisverz1">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Index or Table of Contents</emph> tab
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147449" xml-lang="en-US" l10n="U" oldref="72"><variable id="verz2">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Index/Table</emph> tab (depending on the type) 
+<paragraph role="paragraph" id="par_id3147449" xml-lang="en-US"><variable id="verz2">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Index or Table of Contents</emph> tab (depending on the type)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149835" xml-lang="en-US" l10n="U" oldref="73"><variable id="verz21">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Index/Table</emph> tab (when Table of Contents is the selected type) 
+<paragraph role="paragraph" id="par_id3149835" xml-lang="en-US"><variable id="verz21">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Index or Table of Contents</emph> tab (when Table of Contents is the selected type)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3148855" xml-lang="en-US" l10n="U" oldref="74"><variable id="verz22">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Index/Table</emph> tab (when Alphabetical Index is the selected type) 
+<paragraph role="paragraph" id="par_id3148855" xml-lang="en-US"><variable id="verz22">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Index or Table of Contents</emph> tab (when Alphabetical Index is the selected type)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155575" xml-lang="en-US" l10n="U" oldref="75"><variable id="verz23">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Index/Table</emph> tab (when Illustration Index is the selected type) 
+<paragraph role="paragraph" id="par_id3155575" xml-lang="en-US"><variable id="verz23">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Index or Table of Contents</emph> tab (when Illustration Index is the selected type)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3151080" xml-lang="en-US" l10n="U" oldref="76"><variable id="verz24">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Index/Table</emph> tab (when Index of Tables is the selected type) 
+<paragraph role="paragraph" id="par_id3151080" xml-lang="en-US"><variable id="verz24">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Index or Table of Contents</emph> tab (when Index of Tables is the selected type)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154777" xml-lang="en-US" l10n="U" oldref="77"><variable id="verz25">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Index/Table</emph> tab (when User-Defined is the selected type) 
+<paragraph role="paragraph" id="par_id3154777" xml-lang="en-US"><variable id="verz25">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Index or Table of Contents</emph> tab (when User-Defined is the selected type)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3148448" xml-lang="en-US" l10n="U" oldref="78"><variable id="verz26">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Index/Table</emph> tab (when Table of Objects is the selected type) 
+<paragraph role="paragraph" id="par_id3148448" xml-lang="en-US"><variable id="verz26">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Index or Table of Contents</emph> tab (when Table of Objects is the selected type)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145304" xml-lang="en-US" l10n="U" oldref="79"><variable id="verz27">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Index/Table</emph> tab (when Bibliography is the selected type) 
+<paragraph role="paragraph" id="par_id3145304" xml-lang="en-US"><variable id="verz27">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Index or Table of Contents</emph> tab (when Bibliography is the selected type)
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3153295" xml-lang="en-US"><variable id="verz28">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Index or Table of Contents</emph>, mark "Additional Styles" check box and then click <emph>Assign styles</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150173" xml-lang="en-US" l10n="U" oldref="81"><variable id="verz3">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Entries</emph> tab (depending on type selected) 
+<paragraph role="paragraph" id="par_id3150173" xml-lang="en-US"><variable id="verz3">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Entries</emph> tab (depending on type selected)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154725" xml-lang="en-US" l10n="U" oldref="82"><variable id="verz31">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Entries</emph> tab (when Table of Contents is the selected type) 
+<paragraph role="paragraph" id="par_id3154725" xml-lang="en-US"><variable id="verz31">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Entries</emph> tab (when Table of Contents is the selected type)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150448" xml-lang="en-US" l10n="U" oldref="83"><variable id="verz32">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Entries</emph> tab (when Alphabetical Index is the selected type) 
+<paragraph role="paragraph" id="par_id3150448" xml-lang="en-US"><variable id="verz32">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Entries</emph> tab (when Alphabetical Index is the selected type)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3156101" xml-lang="en-US" l10n="U" oldref="84"><variable id="verz33">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Entries</emph> tab (when Illustration Index is the selected type) 
+<paragraph role="paragraph" id="par_id3156101" xml-lang="en-US"><variable id="verz33">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Entries</emph> tab (when Illustration Index is the selected type)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3156125" xml-lang="en-US" l10n="U" oldref="85"><variable id="verz34">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Entries</emph> tab (when Index of Tables is the selected type) 
+<paragraph role="paragraph" id="par_id3156125" xml-lang="en-US"><variable id="verz34">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Entries</emph> tab (when Index of Tables is the selected type)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153982" xml-lang="en-US" l10n="U" oldref="86"><variable id="verz35">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Entries</emph> tab (when User-Defined is the selected type) 
+<paragraph role="paragraph" id="par_id3153982" xml-lang="en-US"><variable id="verz35">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Entries</emph> tab (when User-Defined is the selected type)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155597" xml-lang="en-US" l10n="U" oldref="87"><variable id="verz36">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Entries</emph> tab (when Table of Objects is the selected type) 
+<paragraph role="paragraph" id="par_id3155597" xml-lang="en-US"><variable id="verz36">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Entries</emph> tab (when Table of Objects is the selected type)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145625" xml-lang="en-US" l10n="U" oldref="88"><variable id="verz37">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Entries</emph> tab (when Bibliography is the selected type) 
+<paragraph role="paragraph" id="par_id3145625" xml-lang="en-US"><variable id="verz37">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Entries</emph> tab (when Bibliography is the selected type)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149767" xml-lang="en-US" l10n="U" oldref="89"><variable id="litdef">Choose <emph>Insert - Indexes and Tables - </emph>
-<emph>Bibliography Entry</emph> and click <emph>Edit</emph>
+<paragraph role="paragraph" id="par_id3149767" xml-lang="en-US"><variable id="litdef">Choose <emph>Insert - Table of Contents and Index - Bibliography Entry</emph> and click <emph>Edit</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150918" xml-lang="en-US" l10n="U" oldref="68"><variable id="stichwortverzeichnisverz3">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Styles</emph> tab 
+<paragraph role="paragraph" id="par_id3150918" xml-lang="en-US"><variable id="stichwortverzeichnisverz3">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Styles</emph> tab
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3149249" xml-lang="en-US" l10n="U" oldref="24"><variable id="briefumschlag">Choose <emph>Insert - Envelope</emph>
 </variable></paragraph>
diff --git a/source/text/swriter/01/02160000.xhp b/source/text/swriter/01/02160000.xhp
index 6bb0a0032c..91e57709ec 100644
--- a/source/text/swriter/01/02160000.xhp
+++ b/source/text/swriter/01/02160000.xhp
@@ -33,7 +33,7 @@
 
 <paragraph id="hd_id3154567" role="heading" level="1" xml-lang="en-US">Edit Index Entry</paragraph>
 <paragraph id="par_id3151314" role="paragraph" xml-lang="en-US"><variable id="index_entry_text"><variable id="verzeichniseintragtext"><ahelp hid=".uno:IndexEntryDialog">Edits the selected index entry. Click in front of or in the index entry, and then choose this command.</ahelp> </variable></variable></paragraph>
-<paragraph id="par_id3155896" role="paragraph" xml-lang="en-US">To insert an index entry, select a word in the document, and then choose <link href="text/swriter/01/04120100.xhp" name="Insert - Indexes and Tables - Entry"><item type="menuitem">Insert - Table of Contents and Index - Index Entry</item></link>.</paragraph>
+<paragraph id="par_id3155896" role="paragraph" xml-lang="en-US">To insert an index entry, select a word in the document, and then choose <link href="text/swriter/01/04120100.xhp" name="Insert - Table of Contents and Index - Index Entry"><item type="menuitem">Insert - Table of Contents and Index - Index Entry</item></link>.</paragraph>
 
 <section id="howtoget">
 <embed href="text/swriter/00/00000402.xhp#verzeichniseintrag"/>
diff --git a/source/text/swriter/01/04120100.xhp b/source/text/swriter/01/04120100.xhp
index 10d53a8a0b..463d54ea32 100644
--- a/source/text/swriter/01/04120100.xhp
+++ b/source/text/swriter/01/04120100.xhp
@@ -69,7 +69,7 @@
 <paragraph role="heading" id="hd_id3156278" xml-lang="en-US" level="3" l10n="U" oldref="19">Apply to all similar texts</paragraph>
 <paragraph role="paragraph" id="par_id3145783" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="modules/swriter/ui/indexentry/applytoallcb">Automatically marks all other occurrences of the selected text in the document. Text in headers, footers, frames, and captions is not included.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3155920" xml-lang="en-US" l10n="U" oldref="21">You cannot use the function for an <emph>Entry </emph>that you entered manually in this dialog.</paragraph>
-<paragraph role="tip" id="par_id3147496" xml-lang="en-US" l10n="U" oldref="18">To include all occurrences of a text passage in an index, select the text, choose<emph> Edit - Find &amp; Replace</emph>, and click <emph>Find All</emph>. Then choose <emph>Insert - Indexes and Tables - Entry</emph> and click <emph>Insert</emph>.</paragraph>
+<paragraph role="tip" id="par_id3147496" xml-lang="en-US">To include all occurrences of a text passage in an index, select the text, choose<emph> Edit - Find &amp; Replace</emph>, and click <emph>Find All</emph>. Then choose <emph>Insert - Table of Contents and Index - Index Entry</emph> and click <emph>Insert</emph>.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/indexentry/searchcasesensitivecb" id="bm_id3150555" localize="false"/>
 <paragraph role="heading" id="hd_id3149568" xml-lang="en-US" level="3" l10n="U" oldref="32">Match case</paragraph>
 <paragraph role="paragraph" id="par_id3150562" xml-lang="en-US" l10n="E" localize="false"><ahelp hid="modules/swriter/ui/indexentry/searchcasesensitivecb"><embedvar href="text/shared/01/02100000.xhp#exakt"/></ahelp></paragraph>
diff --git a/source/text/swriter/01/04120200.xhp b/source/text/swriter/01/04120200.xhp
index 92d855e399..ea4f20f996 100644
--- a/source/text/swriter/01/04120200.xhp
+++ b/source/text/swriter/01/04120200.xhp
@@ -34,7 +34,7 @@
   
   <bookmark xml-lang="en-US" branch="hid/.uno:InsertMultiIndex" id="bm_id588301" localize="false"/><!-- HID added by script -->
 <bookmark branch="hid/.uno:InsertMultiIndex" xml-lang="en-US" id="bm_id3154471" localize="false"/><paragraph role="heading" level="1" id="hd_id3151312" l10n="U" xml-lang="en-US" oldref="1">Insert Index/Table</paragraph>
-  <paragraph l10n="U" role="paragraph" id="par_id3154476" xml-lang="en-US" oldref="2"><variable id="verzeichnisse"><ahelp hid=".uno:InsertMultiIndex" visibility="visible">Inserts an index or a table of contents at the current cursor position.</ahelp> To edit an index or table of contents, place the cursor in the index or table of contents, and then choose <emph>Insert - Indexes and Tables - Indexes and Tables</emph>.</variable></paragraph>
+  <paragraph l10n="U" role="paragraph" id="par_id3154476" xml-lang="en-US" oldref="2"><variable id="verzeichnisse"><ahelp hid=".uno:InsertMultiIndex" visibility="visible">Inserts an index or a table of contents at the current cursor position.</ahelp> To edit an index or table of contents, place the cursor in the index or table of contents, and then choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography</emph>.</variable></paragraph>
   <section id="howtoget">
   <embed href="text/swriter/00/00000404.xhp#stichwortverzeichnisverz"/>
 </section>
diff --git a/source/text/swriter/01/04120210.xhp b/source/text/swriter/01/04120210.xhp
index db343ded1d..1b838c8753 100644
--- a/source/text/swriter/01/04120210.xhp
+++ b/source/text/swriter/01/04120210.xhp
@@ -22,7 +22,7 @@
 <helpdocument version="1.0">
 <meta>
 <topic id="textswriter0104120210xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Index/Table</title>
+<title xml-lang="en-US" id="tit">Index or Table of Contents</title>
 <filename>/text/swriter/01/04120210.xhp</filename>
 </topic>
 <history>
@@ -33,7 +33,7 @@
   
   
   <section id="verzeichnis">
-  <paragraph id="hd_id3150933" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/swriter/01/04120210.xhp" name="Index/Table">Index/Table</link></paragraph>
+  <paragraph id="hd_id3150933" role="heading" level="1" xml-lang="en-US"><link href="text/swriter/01/04120210.xhp" name="Index or Table of Contents">Index or Table of Contents</link></paragraph>
   <paragraph xml-lang="en-US" role="paragraph" id="par_id3148390" l10n="U" oldref="2">Use this tab to specify and define the type of  <link href="text/swriter/01/04120200.xhp" name="index">index</link> that you want to insert. You can also create custom indexes.</paragraph>
   </section>
   <section id="howtoget">
@@ -56,6 +56,6 @@
   <embed href="text/swriter/01/04120217.xhp#verzeichnis"/>
   <embed href="text/shared/00/00000004.xhp#related"/>
   <paragraph l10n="U" role="paragraph" id="par_id3154278" xml-lang="en-US" oldref="11"><link href="text/swriter/guide/main.xhp" name="Using Tables of Content and Indexes">Using Tables of Content and Indexes</link></paragraph>
-  <paragraph l10n="U" role="paragraph" id="par_id3152942" xml-lang="en-US" oldref="12"><link href="text/swriter/01/04120100.xhp" name="Insert - Indexes and Tables - Entry">Insert - Indexes and Tables - Entry</link></paragraph>
+  <paragraph role="paragraph" id="par_id3152942" xml-lang="en-US"><link href="text/swriter/01/04120100.xhp" name="Insert - Indexes and Tables - Entry">Insert - Table of Contents and Index - Index Entry</link></paragraph>
  </body>
 </helpdocument>
diff --git a/source/text/swriter/01/04120211.xhp b/source/text/swriter/01/04120211.xhp
index e818dfb06e..23cc5cae46 100644
--- a/source/text/swriter/01/04120211.xhp
+++ b/source/text/swriter/01/04120211.xhp
@@ -39,7 +39,7 @@
          <paragraph xml-lang="en-US" id="par_id3149286" role="paragraph" l10n="U" oldref="4">Specify the type and title of the index.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocindexpage/type" id="bm_id3145412" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3151171" role="heading" level="3" l10n="U" oldref="5">Type</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3145418" role="paragraph" l10n="U" oldref="6"><ahelp hid="modules/swriter/ui/tocindexpage/type">Select the type of index that you want to insert.</ahelp> The options available on this tab depend on the index type that you select. If the cursor is in an index when you choose the <emph>Insert - Indexes and Tables - Indexes and Tables</emph>, you can then edit that index.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145418" role="paragraph"><ahelp hid="modules/swriter/ui/tocindexpage/type">Select the type of index that you want to insert.</ahelp> The options available on this tab depend on the index type that you select. If the cursor is in an index when you choose the <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography</emph>, you can then edit that index.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocindexpage/title" id="bm_id3149812" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3149801" role="heading" level="3" l10n="U" oldref="7">Title</paragraph>
          <paragraph xml-lang="en-US" id="par_id3153532" role="paragraph" l10n="U" oldref="8"><ahelp hid="modules/swriter/ui/tocindexpage/title">Enter a title for the selected index.</ahelp></paragraph>
@@ -79,7 +79,7 @@
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tocindexpage/indexmarks" id="bm_id3155854" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3151374" role="heading" level="3" l10n="U"
                     oldref="25">Index marks</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3155861" role="paragraph" l10n="U" oldref="26"><ahelp hid="modules/swriter/ui/tocindexpage/indexmarks">Includes the index entries that you inserted by choosing <emph>Insert - Indexes and Tables - Entry</emph> in the index.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155861" role="paragraph"><ahelp hid="modules/swriter/ui/tocindexpage/indexmarks">Includes the index entries that you inserted by choosing <emph>Insert - Table of Contents and Index - Index Entry</emph> in the index.</ahelp></paragraph>
       </section>
    </body>
 </helpdocument>
diff --git a/source/text/swriter/01/04120220.xhp b/source/text/swriter/01/04120220.xhp
index 99b1361ddd..fdaa888682 100644
--- a/source/text/swriter/01/04120220.xhp
+++ b/source/text/swriter/01/04120220.xhp
@@ -34,7 +34,7 @@
   
   <section id="eintraege">
   <bookmark branch="hid/modules/swriter/ui/tocentriespage/TocEntriesPage" xml-lang="en-US" id="bm_id3145824" localize="false"/><paragraph id="hd_id3149349" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/swriter/01/04120220.xhp" name="Entries (indexes/tables)">Entries (indexes/tables)</link></paragraph>
-  <paragraph l10n="U" role="paragraph" id="par_id3154504" xml-lang="en-US" oldref="2"><ahelp visibility="visible" hid="modules/swriter/ui/tocentriespage/TocEntriesPage">Specify the format of the index or table entries. The appearance of this tab changes to reflect the type of index that you selected on the <link href="text/swriter/01/04120210.xhp" name="Index/Table">Index/Table</link> tab.</ahelp></paragraph>
+  <paragraph role="paragraph" id="par_id3154504" xml-lang="en-US"><ahelp visibility="visible" hid="modules/swriter/ui/tocentriespage/TocEntriesPage">Specify the format of the index or table entries. The appearance of this tab changes to reflect the type of index that you selected on the <link href="text/swriter/01/04120210.xhp" name="Index or Table of Contents">Index or Table of Contents</link> tab.</ahelp></paragraph>
   </section>
   <section id="howtoget">
   <embed href="text/swriter/00/00000404.xhp#verz3"/>
diff --git a/source/text/swriter/01/04120250.xhp b/source/text/swriter/01/04120250.xhp
index 84f1e5a1de..54a7b7065c 100644
--- a/source/text/swriter/01/04120250.xhp
+++ b/source/text/swriter/01/04120250.xhp
@@ -38,7 +38,7 @@
 <paragraph role="heading" id="hd_id3154645" xml-lang="en-US" level="2" l10n="U" oldref="19">To access the Edit Concordance File dialog:</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3149292" xml-lang="en-US" l10n="U" oldref="20">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Index/Table</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3149292" xml-lang="en-US">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography - Index or Table of Contents</emph>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3145420" xml-lang="en-US" l10n="U" oldref="21">In the <emph>Type </emph>box, select "Alphabetical Index".</paragraph>
diff --git a/source/text/swriter/guide/indices_edit.xhp b/source/text/swriter/guide/indices_edit.xhp
index 8f7a8ab7d1..581315e68b 100644
--- a/source/text/swriter/guide/indices_edit.xhp
+++ b/source/text/swriter/guide/indices_edit.xhp
@@ -47,7 +47,7 @@
             <paragraph xml-lang="en-US" id="par_id3154248" role="listitem" l10n="U" oldref="58">Right-click and choose an editing option from the menu.</paragraph>
          </listitem>
       </list>
-      <paragraph xml-lang="en-US" id="par_id3155872" role="paragraph" l10n="U" oldref="60">You can also make changes directly to an index or table of contents. Right-click in the index or table of contents, choose <emph>Edit Index/Table</emph>, click <emph>Index/Table</emph> tab, and then clear the <emph>Protected from manual changes</emph> check box.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155872" role="paragraph">You can also make changes directly to an index or table of contents. Right-click in the index or table of contents, choose <emph>Edit Index or Table of Contents</emph>, click <emph>Index or Table of Contents</emph> tab, and then clear the <emph>Protected against manual changes</emph> check box.</paragraph>
       <embed href="text/shared/00/00000004.xhp#related"/>
       <embed href="text/swriter/guide/indices_toc.xhp#indices_toc"/>
       <embed href="text/swriter/guide/indices_edit.xhp#indices_edit"/>
diff --git a/source/text/swriter/guide/indices_enter.xhp b/source/text/swriter/guide/indices_enter.xhp
index 5d02ae1964..b21a7a00d0 100644
--- a/source/text/swriter/guide/indices_enter.xhp
+++ b/source/text/swriter/guide/indices_enter.xhp
@@ -39,7 +39,7 @@
             <paragraph xml-lang="en-US" id="par_id3156380" role="listitem" l10n="U" oldref="7">Click in a word, or select the words in your document that you want to use as an index entry.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3147409" role="listitem" l10n="U" oldref="9">Choose <emph>Insert - Indexes and Tables - Entry</emph>, and do one of the following:</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3147409" role="listitem">Choose <emph>Insert - Table of Contents and Index - Index Entry</emph>, and do one of the following:</paragraph>
          </listitem>
       </list>
 
diff --git a/source/text/swriter/guide/indices_index.xhp b/source/text/swriter/guide/indices_index.xhp
index 4326fe12d0..3ef81a5185 100644
--- a/source/text/swriter/guide/indices_index.xhp
+++ b/source/text/swriter/guide/indices_index.xhp
@@ -41,10 +41,10 @@
     <paragraph id="par_id3154233" role="listitem" xml-lang="en-US">Click in your document where you want to insert the index.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3154252" role="listitem" xml-lang="en-US">Choose <emph>Insert - Indexes and Tables - Indexes and Tables</emph>.</paragraph>
+    <paragraph id="par_id3154252" role="listitem" xml-lang="en-US">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography</emph>.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3155884" role="listitem" xml-lang="en-US">On the <emph>Index/Table</emph> tab, select "Alphabetical Index" in the <emph>Type</emph> box.</paragraph>
+    <paragraph id="par_id3155884" role="listitem" xml-lang="en-US">On the <emph>Index or Table of Contents</emph> tab, select "Alphabetical Index" in the <emph>Type</emph> box.</paragraph>
   </listitem>
   <listitem>
     <paragraph id="par_id3147114" role="listitem" xml-lang="en-US">If you want to use a concordance file, select <item type="menuitem">Concordance file</item> in the <item type="menuitem">Options</item> area, click the <item type="menuitem">File</item> button, and then locate an existing file or create a new concordance file.</paragraph>
diff --git a/source/text/swriter/guide/indices_literature.xhp b/source/text/swriter/guide/indices_literature.xhp
index 67fe478095..7507ff7d0d 100644
--- a/source/text/swriter/guide/indices_literature.xhp
+++ b/source/text/swriter/guide/indices_literature.xhp
@@ -66,7 +66,7 @@
     <paragraph id="par_id3150945" role="listitem" xml-lang="en-US">Click in your document where you want to add the bibliography entry.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3150964" role="listitem" xml-lang="en-US">Choose <link href="text/swriter/01/04120300.xhp" name="Insert - Indexes and Tables - Bibliography Entry"><emph>Insert - Indexes and Tables - Bibliography Entry</emph></link>.</paragraph>
+    <paragraph id="par_id3150964" role="listitem" xml-lang="en-US">Choose <link href="text/swriter/01/04120300.xhp" name="Insert - Table of Contents and Index - Bibliography Entry"><emph>Insert - Table of Contents and Index - Bibliography Entry</emph></link>.</paragraph>
   </listitem>
   <listitem>
     <paragraph id="par_id3150525" role="listitem" xml-lang="en-US">Select <emph>From document content</emph> and click <emph>New</emph>.</paragraph>
@@ -93,7 +93,7 @@
     <paragraph id="par_id3148402" role="listitem" xml-lang="en-US">Click in your document where you want to add the bibliography entry.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3148421" role="listitem" xml-lang="en-US">Choose <emph>Insert - Indexes and Tables - Bibliography Entry</emph>.</paragraph>
+    <paragraph id="par_id3148421" role="listitem" xml-lang="en-US">Choose <emph>Insert - Table of Contents and Index - Bibliography Entry</emph>.</paragraph>
   </listitem>
 </list>
 
diff --git a/source/text/swriter/guide/indices_multidoc.xhp b/source/text/swriter/guide/indices_multidoc.xhp
index b99095585f..71bd3ff799 100644
--- a/source/text/swriter/guide/indices_multidoc.xhp
+++ b/source/text/swriter/guide/indices_multidoc.xhp
@@ -45,7 +45,7 @@
                <item type="menuitem">Insert - Section</item>, select <item type="menuitem">Link</item>, click the <item type="menuitem">Browse</item> button, and then locate and insert a named index section.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3150230" role="listitem" l10n="CHG" oldref="46">Create a <link href="text/shared/01/01010001.xhp" name="master document">master document</link>, add as subdocuments the files that you want to include in the index, and then choose <emph>Insert - Index and Tables - Indexes and Tables</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3150230" role="listitem">Create a <link href="text/shared/01/01010001.xhp" name="master document">master document</link>, add as subdocuments the files that you want to include in the index, and then choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography</emph>.</paragraph>
          </listitem>
       </list>
       <embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/source/text/swriter/guide/indices_toc.xhp b/source/text/swriter/guide/indices_toc.xhp
index cd48842be1..218ba06090 100644
--- a/source/text/swriter/guide/indices_toc.xhp
+++ b/source/text/swriter/guide/indices_toc.xhp
@@ -46,7 +46,7 @@
     <paragraph id="par_id3150510" role="listitem" xml-lang="en-US">Click in your document where you want to create the table of contents.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3150528" role="listitem" xml-lang="en-US">Choose <emph>Insert - Indexes and Tables - Indexes and Tables</emph>, and then click the <link href="text/swriter/01/04120211.xhp" name="Index/Table"><emph>Index/Table</emph></link> tab.</paragraph>
+    <paragraph id="par_id3150528" role="listitem" xml-lang="en-US">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography</emph>, and then click the <link href="text/swriter/01/04120211.xhp" name="Index or Table of Contents"><emph>Index or Table of Contents</emph></link> tab.</paragraph>
   </listitem>
   <listitem>
     <paragraph id="par_id3153746" role="listitem" xml-lang="en-US">Select "Table of Contents" in the <emph>Type</emph> box.</paragraph>
diff --git a/source/text/swriter/guide/indices_userdef.xhp b/source/text/swriter/guide/indices_userdef.xhp
index 9d8f0762d2..77ac66822c 100644
--- a/source/text/swriter/guide/indices_userdef.xhp
+++ b/source/text/swriter/guide/indices_userdef.xhp
@@ -43,7 +43,7 @@
     <paragraph id="par_id3155867" role="listitem" xml-lang="en-US">Select a word or words that you want to add to a user-defined index.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3153410" role="listitem" xml-lang="en-US">Choose <emph>Insert - Indexes and Tables - Entry</emph>.</paragraph>
+    <paragraph id="par_id3153410" role="listitem" xml-lang="en-US">Choose <emph>Insert - Table of Contents and Index - Index Entry</emph>.</paragraph>
   </listitem>
   <listitem>
     <paragraph id="par_id3154248" role="listitem" xml-lang="en-US">Click the <item type="menuitem">New User-defined Index</item> button next to the <item type="menuitem">Index</item> box.</paragraph>
@@ -66,10 +66,10 @@
     <paragraph id="par_id3150933" role="listitem" xml-lang="en-US">Click in the document where you want to insert the index.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3150952" role="listitem" xml-lang="en-US">Choose <emph>Insert - Indexes and Tables - Indexes and Tables</emph>.</paragraph>
+    <paragraph id="par_id3150952" role="listitem" xml-lang="en-US">Choose <emph>Insert - Table of Contents and Index - Table of Contents, Index or Bibliography</emph>.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3150509" role="listitem" xml-lang="en-US">On the <item type="menuitem">Index/Table</item> tab, select the name of the user-defined index that you created in the <item type="menuitem">Type</item> box.</paragraph>
+    <paragraph id="par_id3150509" role="listitem" xml-lang="en-US">On the <item type="menuitem">Index or Table of Contents</item> tab, select the name of the user-defined index that you created in the <item type="menuitem">Type</item> box.</paragraph>
   </listitem>
 </list>