tdf#154996 Add tabbed UI commands in Help page

+ refactoring

Change-Id: Ib680bf78031d83b56695ed79633440aa79fc5c8e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152691
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

9 files changed, 186 insertions, 99 deletions

diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk
index 4579695e49..816102e3c5 100644
--- a/AllLangHelp_swriter.mk
+++ b/AllLangHelp_swriter.mk
@@ -176,7 +176,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
     helpcontent2/source/text/swriter/01/06220000 \
     helpcontent2/source/text/swriter/01/06990000 \
     helpcontent2/source/text/swriter/01/contentcontrol00 \
-    helpcontent2/source/text/swriter/01/edit_reference_submenu \
     helpcontent2/source/text/swriter/01/accessibility_check \
     helpcontent2/source/text/swriter/01/format_object \
     helpcontent2/source/text/swriter/01/goto \
@@ -423,6 +422,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
     helpcontent2/source/text/swriter/main0216 \
     helpcontent2/source/text/swriter/main0220 \
     helpcontent2/source/text/swriter/main0503 \
+    helpcontent2/source/text/swriter/menu/edit_reference_submenu \
     helpcontent2/source/text/swriter/menu/insert_header_footer \
     helpcontent2/source/text/swriter/menu/insert_footnote_endnote \
     helpcontent2/source/text/swriter/menu/insert_frame \
diff --git a/source/text/shared/00/edit_menu.xhp b/source/text/shared/00/edit_menu.xhp
index 41e82a2653..522fc8a490 100644
--- a/source/text/shared/00/edit_menu.xhp
+++ b/source/text/shared/00/edit_menu.xhp
@@ -363,7 +363,21 @@
 </table>
 </section>
 <paragraph role="paragraph" id="par_id3147338"><variable id="litdat">Choose <menuitem>Tools - Bibliography Database</menuitem>.</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149281"><variable id="link">Choose <menuitem>Edit - External Links</menuitem>.</variable></paragraph>
+
+<section id="link">
+    <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+    <switch select="appl">
+        <case select="CALC">
+            <paragraph role="paragraph" id="par_id631686092409826">Choose <menuitem>Edit - Links to External Files</menuitem>.</paragraph>
+        </case>
+        <case select="MATH"/>
+        <case select="BASE"/>
+        <default>
+            <paragraph role="paragraph" id="par_id3149281">Choose <menuitem>Edit - External Links</menuitem>.</paragraph>
+        </default>
+    </switch>
+</section>
+
 <paragraph role="paragraph" id="par_id3159339"><variable id="linkae">Choose <menuitem>Edit - External Links - Modify</menuitem> (DDE links only).</variable></paragraph>
 <section id="frame_properties">
 <paragraph role="paragraph" id="par_id3148927">Select a frame, then choose <menuitem>Edit - OLE Object - Properties</menuitem>.</paragraph>
@@ -372,6 +386,23 @@
 <paragraph role="paragraph" id="par_id3149259"><variable id="edit1">Choose <menuitem>Edit - OLE Object</menuitem>.</variable></paragraph>
 <paragraph role="paragraph" id="par_id3154966"><variable id="edit2">Choose <menuitem>Edit - OLE Object - Edit</menuitem>, also in the context menu of selected object.</variable></paragraph>
 <paragraph role="paragraph" id="par_id3149565"><variable id="edit3">Choose <menuitem>Edit - OLE Object - Open</menuitem>.</variable></paragraph>
-<paragraph role="paragraph" id="par_id951603556032047"><variable id="reference">Choose <menuitem>Edit - Reference</menuitem>.</variable></paragraph>
+
+<section id="reference">
+    <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+    <paragraph role="paragraph" id="par_id951603556032047">Choose <menuitem>Edit - Reference</menuitem>.</paragraph>
+    <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+    <table id="tab_id51686083178680">
+        <tablerow>
+            <tablecell>
+                <paragraph id="par_id1001686083178681" role="paragraph">
+                    <image src="cmd/lc_insertreferencefield.svg" id="img_id811686083178682" width="1cm"  height="1cm"><alt id="alt_id281686083178683">Icon Reference</alt></image>
+                </paragraph>
+            </tablecell>
+            <tablecell>
+                <paragraph id="par_id671686083178685" role="paragraph">Reference</paragraph>
+            </tablecell>
+        </tablerow>
+    </table>
+</section>
 </body>
 </helpdocument>
diff --git a/source/text/shared/01/02180000.xhp b/source/text/shared/01/02180000.xhp
index 1c88d2b209..ff4eb64cd0 100644
--- a/source/text/shared/01/02180000.xhp
+++ b/source/text/shared/01/02180000.xhp
@@ -20,69 +20,69 @@
 
 <meta>
   <topic id="textshared0102180000xml" indexer="include" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">Edit External Links</title>
+    <title id="tit">Edit External Links</title>
     <filename>/text/shared/01/02180000.xhp</filename>
   </topic>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/.uno:LinkDialog" id="bm_id199976" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:EditLinks" id="bm_id5458456" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ManageLinks" id="bm_id4013242" localize="false"/>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3156156">
+<bookmark branch="hid/.uno:LinkDialog" id="bm_id199976" localize="false"/>
+<bookmark branch="hid/.uno:EditLinks" id="bm_id5458456" localize="false"/>
+<bookmark branch="hid/.uno:ManageLinks" id="bm_id4013242" localize="false"/>
+<bookmark branch="index" id="bm_id3156156">
   <bookmark_value>opening;documents with links</bookmark_value>
   <bookmark_value>links; updating specific links</bookmark_value>
   <bookmark_value>updating; links, on opening</bookmark_value>
   <bookmark_value>links; opening files with</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/baselinksdialog/BaseLinksDialog" id="bm_id4889980" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/baselinksdialog/@@nowidget@@" id="bm_id4889980" localize="false"/>
+<bookmark branch="hid/cui/ui/baselinksdialog/BaseLinksDialog" id="bm_id4889980" localize="false"/>
+<bookmark branch="hid/cui/ui/baselinksdialog/@@nowidget@@" id="bm_id4889980" localize="false"/>
 
-<h1 id="hd_id3150279" xml-lang="en-US">Edit External Links</h1>
-  <paragraph id="par_id3150774" role="paragraph" xml-lang="en-US"><variable id="links_text"><ahelp hid=".">You can change or break each link to external files in the current document. You can also update the content of the current file to the most recently saved version of linked external file. This command does not apply to hyperlinks, and is not available if the current document does not contain links to other files.</ahelp></variable></paragraph>
-<paragraph role="paragraph" id="par_id271603459179173">This command can be used with external file links to <switchinline select="appl"><caseinline  select="WRITER">sections (place cursor outside of the section), master documents,</caseinline><caseinline select="CALC">sheets linked with <menuitem>Sheet - Insert Sheet from File</menuitem> or <menuitem>Sheet - External Links</menuitem>, Function WEBSERVICE,</caseinline></switchinline> images and OLE objects (when inserted with a link to an external file).</paragraph>
+<h1 id="hd_id3150279">Edit External Links</h1>
+  <paragraph id="par_id3150774" role="paragraph"><variable id="links_text"><ahelp hid=".">You can change or break each link to external files in the current document. You can also update the content of the current file to the most recently saved version of linked external file. This command does not apply to hyperlinks, and is not available if the current document does not contain links to other files.</ahelp></variable></paragraph>
+<paragraph role="paragraph" id="par_id271603459179173">This command can be used with external file links to <switchinline select="appl"><caseinline select="WRITER">sections (place cursor outside of the section), master documents,</caseinline><caseinline select="CALC">sheets linked with <menuitem>Sheet - Insert Sheet from File</menuitem> or <menuitem>Sheet - External Links</menuitem>, Function WEBSERVICE,</caseinline></switchinline> images and OLE objects (when inserted with a link to an external file).</paragraph>
 
 <section id="howtoget">
   <embed href="text/shared/00/edit_menu.xhp#link"/>
 </section>
 
-<bookmark xml-lang="en-US" branch="hid/cui/ui/baselinksdialog/TB_LINKS" id="bm_id48899801" localize="false"/>
+<bookmark branch="hid/cui/ui/baselinksdialog/TB_LINKS" id="bm_id48899801" localize="false"/>
 
-<h2 id="hd_id3155503" xml-lang="en-US">Source file</h2>
-  <paragraph id="par_id3156152" role="paragraph" xml-lang="en-US">Lists the path to the source file. If the path defines a DDE link, relative paths must be preceded with "file:". </paragraph>
-<paragraph id="par_idN10646" role="paragraph" xml-lang="en-US"><ahelp hid="cui/ui/baselinksdialog/TB_LINKS">Double-click a link in the list to open a file dialog where you can select another object for this link.</ahelp></paragraph>
+<h2 id="hd_id3155503">Source file</h2>
+  <paragraph id="par_id3156152" role="paragraph">Lists the path to the source file. If the path defines a DDE link, relative paths must be preceded with "file:". </paragraph>
+<paragraph id="par_idN10646" role="paragraph"><ahelp hid="cui/ui/baselinksdialog/TB_LINKS">Double-click a link in the list to open a file dialog where you can select another object for this link.</ahelp></paragraph>
 
-<h2 id="hd_id3155449" xml-lang="en-US">Element</h2>
-  <paragraph id="par_id3153348" role="paragraph" xml-lang="en-US">Lists the application (if known) that last saved the source file.</paragraph>
+<h2 id="hd_id3155449">Element</h2>
+  <paragraph id="par_id3153348" role="paragraph">Lists the application (if known) that last saved the source file.</paragraph>
 
-<h2 id="hd_id3153061" xml-lang="en-US">Type</h2>
-  <paragraph id="par_id3151384" role="paragraph" xml-lang="en-US">Lists the file type, such as graphic, of the source file.</paragraph>
+<h2 id="hd_id3153061">Type</h2>
+  <paragraph id="par_id3151384" role="paragraph">Lists the file type, such as graphic, of the source file.</paragraph>
 
-<h2 id="hd_id3156343" xml-lang="en-US">Status</h2>
-  <paragraph id="par_id3149046" role="paragraph" xml-lang="en-US">Lists additional information about the source file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/baselinksdialog/AUTOMATIC" id="bm_id0720200903092114" localize="false"/>
+<h2 id="hd_id3156343">Status</h2>
+  <paragraph id="par_id3149046" role="paragraph">Lists additional information about the source file.</paragraph>
+<bookmark branch="hid/cui/ui/baselinksdialog/AUTOMATIC" id="bm_id0720200903092114" localize="false"/>
 
-<h2 id="hd_id3147264" xml-lang="en-US">Automatic</h2>
-  <paragraph id="par_id3147304" role="paragraph" xml-lang="en-US"><ahelp hid="cui/ui/baselinksdialog/AUTOMATIC">Automatically updates the contents of the link when you open the file. Any changes made in the source file are then displayed in the file containing the link. Linked graphic files can only be updated manually.</ahelp> This option is not available for a linked graphic file.</paragraph>
-  <paragraph id="par_id3149456" role="paragraph" xml-lang="en-US">The <emph>Automatic</emph> option is only available for DDE links. You can insert a DDE link by copying the contents from one file and pasting by choosing <emph>Edit - Paste Special</emph>, and then selecting the <emph>Link</emph> box. As DDE is a text based linking system, only the displayed decimals are copied into the target sheet.<comment>removed Calc switch: this feature can be used wherever a cell area can be pasted: everywhere</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/baselinksdialog/MANUAL" id="bm_id0720200903100119" localize="false"/>
+<h2 id="hd_id3147264">Automatic</h2>
+  <paragraph id="par_id3147304" role="paragraph"><ahelp hid="cui/ui/baselinksdialog/AUTOMATIC">Automatically updates the contents of the link when you open the file. Any changes made in the source file are then displayed in the file containing the link. Linked graphic files can only be updated manually.</ahelp> This option is not available for a linked graphic file.</paragraph>
+  <paragraph id="par_id3149456" role="paragraph">The <emph>Automatic</emph> option is only available for DDE links. You can insert a DDE link by copying the contents from one file and pasting by choosing <emph>Edit - Paste Special</emph>, and then selecting the <emph>Link</emph> box. As DDE is a text based linking system, only the displayed decimals are copied into the target sheet.<comment>removed Calc switch: this feature can be used wherever a cell area can be pasted: everywhere</comment></paragraph>
+<bookmark branch="hid/cui/ui/baselinksdialog/MANUAL" id="bm_id0720200903100119" localize="false"/>
 
-<h2 id="hd_id3154938" xml-lang="en-US">Manual</h2>
-  <paragraph id="par_id3151210" role="paragraph" xml-lang="en-US"><ahelp hid="cui/ui/baselinksdialog/MANUAL">Only updates the link when you click the <emph>Update</emph> button.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/baselinksdialog/CHANGE_SOURCE" id="bm_id0720200903111714" localize="false"/>
+<h2 id="hd_id3154938">Manual</h2>
+  <paragraph id="par_id3151210" role="paragraph"><ahelp hid="cui/ui/baselinksdialog/MANUAL">Only updates the link when you click the <emph>Update</emph> button.</ahelp></paragraph>
+<bookmark branch="hid/cui/ui/baselinksdialog/CHANGE_SOURCE" id="bm_id0720200903111714" localize="false"/>
 
-<h2 id="hd_id3151381" xml-lang="en-US">Modify</h2>
-  <paragraph id="par_id3154125" role="paragraph" xml-lang="en-US"><ahelp hid="cui/ui/baselinksdialog/CHANGE_SOURCE">Change the source file for the selected link.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/baselinksdialog/BREAK_LINK" id="bm_id0720200903114311" localize="false"/>
+<h2 id="hd_id3151381">Modify</h2>
+  <paragraph id="par_id3154125" role="paragraph"><ahelp hid="cui/ui/baselinksdialog/CHANGE_SOURCE">Change the source file for the selected link.</ahelp></paragraph>
+<bookmark branch="hid/cui/ui/baselinksdialog/BREAK_LINK" id="bm_id0720200903114311" localize="false"/>
 
-<h2 id="hd_id3147084" xml-lang="en-US">Break Link</h2>
-  <paragraph id="par_id3147230" role="paragraph" xml-lang="en-US"><ahelp hid="cui/ui/baselinksdialog/BREAK_LINK">Breaks the link between the source file and the current document. The most recently updated contents of the source file are kept in the current document.</ahelp></paragraph>
-  <bookmark xml-lang="en-US" branch="hid/cui/ui/baselinksdialog/UPDATE_NOW" id="bm_id0720200903105198" localize="false"/>
+<h2 id="hd_id3147084">Break Link</h2>
+  <paragraph id="par_id3147230" role="paragraph"><ahelp hid="cui/ui/baselinksdialog/BREAK_LINK">Breaks the link between the source file and the current document. The most recently updated contents of the source file are kept in the current document.</ahelp></paragraph>
+  <bookmark branch="hid/cui/ui/baselinksdialog/UPDATE_NOW" id="bm_id0720200903105198" localize="false"/>
 
-<h2 id="hd_id3156280" xml-lang="en-US">Update</h2>
-<paragraph id="par_id3157320" role="paragraph" xml-lang="en-US"><ahelp hid="cui/ui/baselinksdialog/UPDATE_NOW">Updates the selected link so that the most recently saved version of the linked file is displayed in the current document.</ahelp></paragraph>
+<h2 id="hd_id3156280">Update</h2>
+<paragraph id="par_id3157320" role="paragraph"><ahelp hid="cui/ui/baselinksdialog/UPDATE_NOW">Updates the selected link so that the most recently saved version of the linked file is displayed in the current document.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#close"/>
-<note id="par_id3156156" xml-lang="en-US">When you open a file that contains links, you are prompted to update the links. Depending on where the linked files are stored, the update process can take several minutes to complete.</note>
-<note id="par_id3143270"  xml-lang="en-US">If you are loading a file that contains DDE links, you are prompted to update the links. Decline the update if you do not want to establish a connection to the DDE server.</note>
-<paragraph id="par_id3157321" role="warning" xml-lang="en-US">Links to remote locations can be constructed that transmit local data to the remote server. Decline the prompt to update if you do not trust the document.</paragraph>
+<note id="par_id3156156">When you open a file that contains links, you are prompted to update the links. Depending on where the linked files are stored, the update process can take several minutes to complete.</note>
+<note id="par_id3143270">If you are loading a file that contains DDE links, you are prompted to update the links. Decline the update if you do not want to establish a connection to the DDE server.</note>
+<warning id="par_id3157321">Links to remote locations can be constructed that transmit local data to the remote server. Decline the prompt to update if you do not trust the document.</warning>
 </body>
 </helpdocument>
diff --git a/source/text/shared/02/07070000.xhp b/source/text/shared/02/07070000.xhp
index 85ae8f5701..66499c1047 100644
--- a/source/text/shared/02/07070000.xhp
+++ b/source/text/shared/02/07070000.xhp
@@ -39,8 +39,14 @@
 </bookmark><comment>mw inserted "Edit File icon" entry</comment>
 <bookmark xml-lang="en-US" branch="hid/.uno:EditDoc" id="bm_id2451362" localize="false"/>
 <h1 id="hd_id3148520" xml-lang="en-US"><link href="text/shared/02/07070000.xhp">Edit Mode</link></h1>
-<paragraph role="paragraph" id="par_id3153089" xml-lang="en-US"><ahelp hid=".uno:EditDoc" visibility="hidden">Enables you to edit a read-only document or database table.</ahelp> Use the <emph>Edit Mode</emph> option to activate the edit mode.</paragraph>
+<paragraph role="paragraph" id="par_id3153089" xml-lang="en-US"><ahelp hid=".uno:EditDoc">Enables you to edit a read-only document or database table.</ahelp> Use the <emph>Edit Mode</emph> option to activate the edit mode.</paragraph>
 </section>
+<section id="howtoget">
+<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+<paragraph role="paragraph" id="par_id251686099274448">Choose <menuitem>Edit - Edit Mode</menuitem>.</paragraph>
+<embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+<paragraph role="paragraph" id="par_id1001686099454407">Choose <menuitem>Review - Edit Mode</menuitem>.</paragraph>
+<embed href="text/shared/00/00000004.xhp#from_toolbars"/>
 <section id="syedit_mode">
 <table id="tbl_id3157896">
   <tablerow>
@@ -53,6 +59,10 @@
   </tablerow>
 </table>
 </section>
+<embed href="text/shared/00/00000004.xhp#from_keyboard"/>
+<paragraph role="paragraph" id="par_id471686099219977"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode> + Shift + M</keycode></paragraph>
+</section>
+
 <section id="selecttext">
 <paragraph role="paragraph" id="par_id3147576" xml-lang="en-US"><ahelp hid=".">You can enable a selection cursor in a read-only text document or in the Help. Choose <menuitem>Edit - Select Text</menuitem> or open the context menu of a read-only document and choose <menuitem>Select Text</menuitem>. The selection cursor does not blink.</ahelp></paragraph>
 </section>
diff --git a/source/text/shared/02/09070000.xhp b/source/text/shared/02/09070000.xhp
index a2211a6c3e..bcb31a54fb 100644
--- a/source/text/shared/02/09070000.xhp
+++ b/source/text/shared/02/09070000.xhp
@@ -20,68 +20,74 @@
 
 <meta>
   <topic id="textshared0209070000xml" indexer="include" status="PUBLISH">
-    <title xml-lang="en-US" id="tit">Hyperlink Dialog</title>
+    <title id="tit">Hyperlink Dialog</title>
     <filename>/text/shared/02/09070000.xhp</filename>
   </topic>
 </meta>
 <body>
 
 <section id="hyperlink">
-<bookmark xml-lang="en-US" branch="hid/.uno:HyperlinkDialog" id="bm_id4087126" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:EditHyperlink" id="bm_id6121214" localize="false"/>
+<bookmark branch="hid/.uno:HyperlinkDialog" id="bm_id4087126" localize="false"/>
+<bookmark branch="hid/.uno:EditHyperlink" id="bm_id6121214" localize="false"/>
 
-<h1 xml-lang="en-US" id="hd_id3145759"><variable id="hyperdia"><link href="text/shared/02/09070000.xhp">Hyperlink</link></variable></h1>
-<paragraph xml-lang="en-US" id="par_id3156183" role="paragraph"><variable id="hyperdiatext"><ahelp hid=".">Opens a dialog that enables you to edit hyperlinks.</ahelp></variable></paragraph>
+<h1 id="hd_id3145759"><variable id="hyperdia"><link href="text/shared/02/09070000.xhp">Hyperlink</link></variable></h1>
+<paragraph id="par_id3156183" role="paragraph"><variable id="hyperdiatext"><ahelp hid=".">Opens a dialog that enables you to edit hyperlinks.</ahelp></variable></paragraph>
 </section>
 
 <section id="howtoget">
-<paragraph role="paragraph" id="par_id511616406933483">Choose <menuitem>Insert - Hyperlink</menuitem>.</paragraph>
-<paragraph role="paragraph" id="par_id771616410590648">Choose <menuitem>Edit - Hyperlink</menuitem>, when the cursor is placed in a hyperlink.</paragraph>
-<paragraph role="paragraph" id="par_id161616407054506">On <link href="text/shared/main0201.xhp"><emph>Standard</emph></link> bar, click</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph role="paragraph" id="par_id511616406933483">Choose <menuitem>Insert - Hyperlink</menuitem>.</paragraph>
+  <paragraph role="paragraph" id="par_id771616410590648">Choose <menuitem>Edit - Hyperlink</menuitem>, when the cursor is placed in a hyperlink.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_context"/>
+  <paragraph role="paragraph" id="par_id341686079869387">Choose <menuitem>Edit Hyperlink</menuitem>, when the cursor is placed in a hyperlink.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+  <paragraph role="paragraph" id="par_id511686079721406">Choose <menuitem>Insert - Hyperlink</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+  <section id="syhyperdia">
+    <table id="tbl_id3158405">
+      <tablerow>
+        <tablecell>
+          <paragraph id="par_id3154927" role="paragraph"><image id="img_id3093440" src="cmd/lc_inserthyperlink.svg" width="1cm" height="1cm"><alt id="alt_id3093440">Icon Hyperlink</alt></image></paragraph>
+        </tablecell>
+        <tablecell>
+          <paragraph id="par_id3155552" role="paragraph">Hyperlink Dialog</paragraph>
+        </tablecell>
+      </tablerow>
+    </table>
+  </section>
+  <embed href="text/shared/00/00000004.xhp#from_keyboard"/>
+  <paragraph role="paragraph" id="par_id121686079478786"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode> + K</keycode></paragraph>
 </section>
 
-<section id="syhyperdia">
-<table id="tbl_id3158405">
-  <tablerow>
-    <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3154927" role="paragraph"><image id="img_id3093440" src="cmd/sc_hyperlinkdialog.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3093440">Icon</alt></image></paragraph>
-    </tablecell>
-    <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3155552" role="paragraph">Hyperlink Dialog</paragraph>
-    </tablecell>
-  </tablerow>
-</table>
-</section>
-
-<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkdialog/icon_control" id="bm_id3149177" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3155391" role="paragraph"><ahelp hid=".">Select the type of hyperlink to be inserted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:OpenHyperlinkOnCursor" id="bm_id7868083" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3153683" role="paragraph"><ahelp hid=".uno:OpenHyperlinkOnCursor" visibility="hidden">Opens the hyperlink in your default web browser.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:EditHyperlink" id="bm_id0122200902201484" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0122200902231573" role="paragraph"><ahelp hid="." visibility="hidden">Opens the <emph>Hyperlink</emph> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:CopyHyperlinkLocation" id="bm_id0122200902224858" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0122200902231660" role="paragraph"><ahelp hid="." visibility="hidden">Copies the URL to the clipboard.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:RemoveHyperlink" id="bm_id0122200902230774" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0122200902231630" role="paragraph"><ahelp hid="." visibility="hidden">Removes the hyperlink, leaving plain text.</ahelp></paragraph>
+<bookmark branch="hid/cui/ui/hyperlinkdialog/icon_control" id="bm_id3149177" localize="false"/>
+<paragraph id="par_id3155391" role="paragraph"><ahelp hid=".">Select the type of hyperlink to be inserted.</ahelp></paragraph>
+<bookmark branch="hid/.uno:OpenHyperlinkOnCursor" id="bm_id7868083" localize="false"/>
+<paragraph id="par_id3153683" role="paragraph"><ahelp hid=".uno:OpenHyperlinkOnCursor" visibility="hidden">Opens the hyperlink in your default web browser.</ahelp></paragraph>
+<bookmark branch="hid/.uno:EditHyperlink" id="bm_id0122200902201484" localize="false"/>
+<paragraph id="par_id0122200902231573" role="paragraph"><ahelp hid="." visibility="hidden">Opens the <emph>Hyperlink</emph> dialog.</ahelp></paragraph>
+<bookmark branch="hid/.uno:CopyHyperlinkLocation" id="bm_id0122200902224858" localize="false"/>
+<paragraph id="par_id0122200902231660" role="paragraph"><ahelp hid="." visibility="hidden">Copies the URL to the clipboard.</ahelp></paragraph>
+<bookmark branch="hid/.uno:RemoveHyperlink" id="bm_id0122200902230774" localize="false"/>
+<paragraph id="par_id0122200902231630" role="paragraph"><ahelp hid="." visibility="hidden">Removes the hyperlink, leaving plain text.</ahelp></paragraph>
   <embed href="text/shared/02/09070100.xhp#internet"/>
   <embed href="text/shared/02/09070200.xhp#mailnews"/>
   <embed href="text/shared/02/09070300.xhp#document"/>
   <embed href="text/shared/02/09070400.xhp#new_document"/>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkdialog/apply" id="bm_id3149811" localize="false"/>
+<bookmark branch="hid/cui/ui/hyperlinkdialog/apply" id="bm_id3149811" localize="false"/>
 
-<h3 xml-lang="en-US" id="hd_id3166410">Apply</h3>
-<paragraph xml-lang="en-US" id="par_id3147209" role="paragraph"><ahelp hid=".">Applies the data to your document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkdialog/cancel" id="bm_id3159166" localize="false"/>
+<h3 id="hd_id3166410">Apply</h3>
+<paragraph id="par_id3147209" role="paragraph"><ahelp hid=".">Applies the data to your document.</ahelp></paragraph>
+<bookmark branch="hid/cui/ui/hyperlinkdialog/cancel" id="bm_id3159166" localize="false"/>
 
-<h3 xml-lang="en-US" id="hd_id3149398">Close</h3>
-<paragraph xml-lang="en-US" id="par_id3149734" role="paragraph"><ahelp hid=".">Closes the dialog without saving.</ahelp></paragraph>
+<h3 id="hd_id3149398">Close</h3>
+<paragraph id="par_id3149734" role="paragraph"><ahelp hid=".">Closes the dialog without saving.</ahelp></paragraph>
 
-<h3 xml-lang="en-US" id="hd_id3153700">Help</h3>
-<paragraph xml-lang="en-US" id="par_id3150943" role="paragraph">Opens the Help.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkdialog/reset" id="bm_id3155434" localize="false"/>
+<h3 id="hd_id3153700">Help</h3>
+<paragraph id="par_id3150943" role="paragraph">Opens the Help.</paragraph>
+<bookmark branch="hid/cui/ui/hyperlinkdialog/reset" id="bm_id3155434" localize="false"/>
 
-<h3 xml-lang="en-US" id="hd_id3156192">Reset</h3>
-<paragraph xml-lang="en-US" id="par_id3149234" role="paragraph"><ahelp hid=".">Resets the entries in the dialog to their original state.</ahelp></paragraph>
+<h3 id="hd_id3156192">Reset</h3>
+<paragraph id="par_id3149234" role="paragraph"><ahelp hid=".">Resets the entries in the dialog to their original state.</ahelp></paragraph>
 
 <section id="relatedtopics">
   <embed href="text/shared/guide/hyperlink_insert.xhp#hyperlink_insert"/>
diff --git a/source/text/swriter/00/00000402.xhp b/source/text/swriter/00/00000402.xhp
index 1ccabdbccf..4b6d3bd93e 100644
--- a/source/text/swriter/00/00000402.xhp
+++ b/source/text/swriter/00/00000402.xhp
@@ -47,8 +47,48 @@
 </section>
 <paragraph role="paragraph" id="par_id3149349"><variable id="datenaust">Choose <emph>Edit - Exchange Database</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3146316"><variable id="feldbefehl">Choose <emph>Edit - Fields</emph>
-</variable></paragraph>
+
+<section id="feldbefehl">
+<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+<paragraph role="paragraph" id="par_id3146316">Choose <menuitem>Edit - Fields</menuitem>.</paragraph>
+<paragraph role="paragraph" id="par_id601686084207673">Choose <menuitem>Insert - Fields</menuitem>.</paragraph>
+<paragraph role="paragraph" id="par_id621686084297019">Choose <menuitem>Insert - Cross-reference</menuitem>.</paragraph>
+<embed href="text/shared/00/00000004.xhp#from_context"/>
+<paragraph role="paragraph" id="par_id261686084354397"><menuitem>Edit Field</menuitem></paragraph>
+<embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+<paragraph role="paragraph" id="par_id241686084284027">Choose <menuitem>Insert - Fields</menuitem>.</paragraph>
+<paragraph role="paragraph" id="par_id671686084291318">Choose <menuitem>Insert - Cross-reference</menuitem>.</paragraph>
+<paragraph role="paragraph" id="par_id761686084998093">Choose <menuitem>References - Fields</menuitem>.</paragraph>
+<paragraph role="paragraph" id="par_id571686085013340">Choose <menuitem>References - Cross-references</menuitem>.</paragraph>
+<embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+<table id="tab_id311686084424317">
+	<tablerow>
+		<tablecell>
+			<paragraph id="par_id211686084424319" role="paragraph">
+				<image src="cmd/lc_insertreferencefield.svg" id="img_id501686084424320" width="1cm"  height="1cm"><alt id="alt_id741686084424321">Icon Cross-Reference</alt></image>
+			</paragraph>
+		</tablecell>
+		<tablecell>
+			<paragraph id="par_id921686084424323" role="paragraph">Cross-Reference</paragraph>
+		</tablecell>
+	</tablerow>
+</table>
+<table id="tab_id471686084496203">
+	<tablerow>
+		<tablecell>
+			<paragraph id="par_id911686084496205" role="paragraph">
+				<image src="cmd/lc_addfield.svg" id="img_id871686084496206" width="1cm"  height="1cm"><alt id="alt_id621686084496207">Icon Insert Field</alt></image>
+			</paragraph>
+		</tablecell>
+		<tablecell>
+			<paragraph id="par_id481686084496209" role="paragraph">Insert Field</paragraph>
+		</tablecell>
+	</tablerow>
+	</table>
+<embed href="text/shared/00/00000004.xhp#from_keyboard"/>
+<paragraph role="paragraph" id="par_id161686084056231"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode> + F2</keycode></paragraph>
+</section>
+
 <paragraph role="paragraph" id="par_id3154505"><variable id="fussnote">Choose <emph>Edit - Footnotes</emph>
 </variable></paragraph>
 
diff --git a/source/text/swriter/01/02140000.xhp b/source/text/swriter/01/02140000.xhp
index 9f7708eaaf..c2d762a543 100644
--- a/source/text/swriter/01/02140000.xhp
+++ b/source/text/swriter/01/02140000.xhp
@@ -27,7 +27,7 @@
 
 <body>
 
-<bookmark xml-lang="en-US" branch="hid/.uno:FieldDialog" id="bm_id85243" localize="false"/>
+<bookmark branch="hid/.uno:FieldDialog" id="bm_id85243" localize="false"/>
 
 <h1 id="hd_id3150493">Edit Fields</h1>
 <paragraph id="par_id3151184" role="paragraph"><variable id="fields_text"><variable id="feldbefehltext"><ahelp hid=".uno:FieldDialog">Opens a dialog where you can edit the properties of a field. Click in front of a field, and then choose this command.</ahelp> In the dialog, you can use the arrow buttons to move to the previous or the next field. </variable></variable></paragraph>
@@ -46,7 +46,7 @@
 
 <h2 id="hd_id3150687">Select</h2>
 <paragraph id="par_id3150700" role="paragraph">Lists the field options, for example, "fixed". If you want, you can click another option for the selected field type.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddocumentpage/numformat" id="bm_id3155866" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/flddocumentpage/numformat" id="bm_id3155866" localize="false"/>
 
 <h2 id="hd_id3155854">Format</h2>
 <paragraph id="par_id3147409" role="paragraph"><ahelp hid="modules/swriter/ui/flddocumentpage/numformat">Select the format for the contents of the field. For date, time, and user-defined fields, you can also click "Additional formats" in the list, and then choose a different format.</ahelp> The formats that are available depend on the type of field that you are editing.</paragraph>
@@ -95,7 +95,7 @@
 
 <h2 id="hd_id3154025">Record number</h2>
 <paragraph id="par_id3154039" role="paragraph">Displays the database record number that is inserted when the condition specified for the "Any record" field type is met. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_DLG_FLDEDT_PREV" id="bm_id3149971" localize="false"/>
+<bookmark branch="hid/SW_HID_DLG_FLDEDT_PREV" id="bm_id3149971" localize="false"/>
 
 <h2 id="hd_id3149960">Left Arrow</h2>
 <paragraph id="par_id3149602" role="paragraph"><ahelp hid="HID_DLG_FLDEDT_PREV">Jumps to the previous field of the same type in the document.</ahelp> This button is only active when a document contains more than one field of the same type.</paragraph>
@@ -103,7 +103,7 @@
 <table id="tbl_id3149623">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3155341" role="paragraph"> <image id="img_id3155348" src="cmd/lc_prevrecord.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3155348">Icon Previous Field</alt></image></paragraph>
+      <paragraph id="par_id3155341" role="paragraph"> <image id="img_id3155348" src="cmd/lc_prevrecord.svg" width="1cm" height="1cm"><alt id="alt_id3155348">Icon Previous Field</alt></image></paragraph>
     </tablecell>
     <tablecell>
       <paragraph id="par_id3148728" role="paragraph">Previous Field</paragraph>
@@ -111,7 +111,7 @@
   </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SW_HID_DLG_FLDEDT_NEXT" id="bm_id3155552" localize="false"/>
+<bookmark branch="hid/SW_HID_DLG_FLDEDT_NEXT" id="bm_id3155552" localize="false"/>
 
 <h2 id="hd_id3155541">Right Arrow</h2>
 <paragraph id="par_id3146846" role="paragraph"><ahelp hid="HID_DLG_FLDEDT_NEXT">Jumps to the next field of the same type in the document.</ahelp> This button is only active when a document contains more than one field of the same type.</paragraph>
diff --git a/source/text/swriter/main0102.xhp b/source/text/swriter/main0102.xhp
index 997ce5c4cd..d2927f9cf8 100644
--- a/source/text/swriter/main0102.xhp
+++ b/source/text/swriter/main0102.xhp
@@ -53,7 +53,7 @@
 <embed href="text/shared/menu/comment_menu.xhp#comment_menu"/>
 
 <embed href="text/shared/02/09070000.xhp#hyperlink"/>
-<embed href="text/swriter/01/edit_reference_submenu.xhp#edit_reference_head"/>
+<embed href="text/swriter/menu/edit_reference_submenu.xhp#edit_reference_head"/>
 
 <h2 id="hd_id0914201501170124" xml-lang="en-US"><link href="text/swriter/01/02140000.xhp">Fields</link></h2>
 <embed href="text/swriter/01/02140000.xhp#fields_text"/>
diff --git a/source/text/swriter/01/edit_reference_submenu.xhp b/source/text/swriter/menu/edit_reference_submenu.xhp
index 6a679864eb..d59d3527b2 100644
--- a/source/text/swriter/01/edit_reference_submenu.xhp
+++ b/source/text/swriter/menu/edit_reference_submenu.xhp
@@ -11,14 +11,14 @@
 
 <meta>
   <topic id="edit_reference_submenu" indexer="include" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">Reference (Edit)</title>
-    <filename>/text/swriter/01/edit_reference_submenu.xhp</filename>
+    <title id="tit">Reference (Edit)</title>
+    <filename>/text/swriter/menu/edit_reference_submenu.xhp</filename>
   </topic>
 </meta>
 <body>
 
 <section id="edit_reference_head">
-<h1 id="hd_id1001603128268578"><link href="text/swriter/01/edit_reference_submenu.xhp">Reference</link></h1>
+<h1 id="hd_id1001603128268578"><link href="text/swriter/menu/edit_reference_submenu.xhp">Reference</link></h1>
 <paragraph role="paragraph" id="par_id411603128291771">A submenu that offers possibilities to edit footnotes, endnotes, index entries, and bibliography entries.</paragraph>
 </section>
 
@@ -26,13 +26,13 @@
 <embed href="text/shared/00/edit_menu.xhp#reference"/>
 </section>
 
-<h2 id="hd_id3147302" xml-lang="en-US"><link href="text/swriter/01/02150000.xhp">Footnote or Endnote</link></h2>
+<h2 id="hd_id3147302"><link href="text/swriter/01/02150000.xhp">Footnote or Endnote</link></h2>
 <embed href="text/swriter/01/02150000.xhp#footnote_endnote_text"/>
 
-<h2 id="hd_id3147327" xml-lang="en-US"><link href="text/swriter/01/04120100.xhp">Index Entry</link></h2>
+<h2 id="hd_id3147327"><link href="text/swriter/01/04120100.xhp">Index Entry</link></h2>
 <paragraph role="paragraph" id="par_id561673359242198">Edits the selected index entry.</paragraph>
 
-<h2 id="hd_id3147352" xml-lang="en-US"><link href="text/swriter/01/02130000.xhp">Bibliography Entry</link></h2>
+<h2 id="hd_id3147352"><link href="text/swriter/01/02130000.xhp">Bibliography Entry</link></h2>
 <embed href="text/swriter/01/02130000.xhp#bibliography_entry_text"/>
 
 </body>