source/text/shared/01/notebook_bar.xhp |   23 +++++++-------
 source/text/swriter/00/00000403.xhp    |   51 +++++++++++++++++++++++----------
 source/text/swriter/01/03120000.xhp    |    6 +--
 source/text/swriter/01/03130000.xhp    |    9 ++---
 source/text/swriter/main0103.xhp       |    8 +----
 source/text/swriter/main0203.xhp       |    9 +++--
 6 files changed, 63 insertions(+), 43 deletions(-)

New commits:
commit 652da5c0713370d8a711631a80ed29c0c2907faf
Author:     Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Fri Jun 9 17:33:44 2023 -0300
Commit:     Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Tue Jun 20 16:13:38 2023 +0200

    tdf#154996 Add tabbed UI commands in Help page
    
    + refactoring
    + Writer View menu (part 1)
    
    Change-Id: I8848e3102f7294e796a6fcbcd63f22b9bb29f23c
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152806
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
    (cherry picked from commit 367807066f4e2a1190fe056fd6e52026fd35e2a6)
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/153213

diff --git a/source/text/shared/01/notebook_bar.xhp 
b/source/text/shared/01/notebook_bar.xhp
index 25dba5d502..e8af0a4f30 100644
--- a/source/text/shared/01/notebook_bar.xhp
+++ b/source/text/shared/01/notebook_bar.xhp
@@ -20,15 +20,13 @@
 
 <meta>
   <topic id="textshared01notebook_barxml">
-    <title id="tit" xml-lang="en-US">Using the notebook bar</title>
+    <title id="tit">Using the notebook bar</title>
     <filename>/text/shared/01/notebook_bar.xhp</filename>
   </topic>
 </meta>
 
 <body>
-
-
-<bookmark xml-lang="en-US" branch="index" id="bm_id190920161758487840">
+<bookmark branch="index" id="bm_id190920161758487840">
   <bookmark_value>notebook bar;contextual single toolbar</bookmark_value>
   <bookmark_value>notebook bar;contextual groups</bookmark_value>
   <bookmark_value>notebook bar;tabbed mode</bookmark_value>
@@ -43,17 +41,20 @@
 
 <section id="using_the_notebook_bar">
 <h1 id="hd_id190920161731349683"><link 
href="text/shared/01/notebook_bar.xhp">User Interface</link></h1>
-<paragraph role="paragraph" id="par_id791612306305954">Opens the Select Your 
Preferred User Interface dialog to let you choose the user interface layout for 
%PRODUCTNAME.</paragraph>
+<paragraph role="paragraph" id="par_id791612306305954">Opens the <emph>Select 
Your Preferred User Interface</emph> dialog to let you choose the user 
interface layout for %PRODUCTNAME.</paragraph>
 </section>
 
-<paragraph id="par_id190920161732262244" role="paragraph" 
xml-lang="en-US"><ahelp hid=".">The notebook bar shows a different way to 
organize controls and icons than a collection of straight rows of icons, 
displaying contextual groups of commands and contents for a quicker usage and 
better user experience.</ahelp></paragraph>
-
 <section id="howtoget">
-<paragraph id="par_id190920161744066306" role="paragraph" 
xml-lang="en-US">Choose menu <menuitem>View - User 
Interface</menuitem></paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph id="par_id190920161744066306" role="paragraph">Choose menu 
<menuitem>View - User Interface</menuitem></paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+  <paragraph role="paragraph" id="par_id61686342056429">On the tabs row menu, 
choose <menuitem>User Interface</menuitem>.</paragraph>
 </section>
 
+<paragraph id="par_id190920161732262244" role="paragraph"><ahelp hid=".">The 
notebook bar shows a different way to organize controls and icons than a 
collection of straight rows of icons, displaying contextual groups of commands 
and contents for a quicker usage and better user experience.</ahelp></paragraph>
+
 <h2 id="hd_id190920161911374012">User interface layouts</h2>
-<paragraph id="par_id190920161744068946" role="paragraph" xml-lang="en-US">The 
<emph>User Interface</emph> entry defines which user interface elements are 
visible.</paragraph>
+<paragraph id="par_id190920161744068946" role="paragraph">The <emph>User 
Interface</emph> entry defines which user interface elements are 
visible.</paragraph>
 
 <h3 id="par_id190920161744068819">Standard toolbar</h3>
 <paragraph role="paragraph" id="par_id851612307031565">Classic mode with two 
visible toolbars – standard and formatting. The sidebar is partially collapsed 
and shows only tabs. Intended for users who are familiar with the classic 
interface.</paragraph>
@@ -76,7 +77,7 @@
 <h3 id="par_id190920161744069136">Sidebar</h3>
 <paragraph role="paragraph" id="par_id411612308221445">Standard user interface 
with expanded sidebar. Expert users who want to quickly change many different 
properties are advised to use this user interface.</paragraph>
 
-<paragraph id="par_id190920161744063797" role="paragraph" 
xml-lang="en-US">When user activates additional toolbars, they will be saved in 
the user profile. Therefore, on returning from the notebook bar mode, all 
toolbars set visible before will show again.</paragraph>
+<paragraph id="par_id190920161744063797" role="paragraph">When user activates 
additional toolbars, they will be saved in the user profile. Therefore, on 
returning from the notebook bar mode, all toolbars set visible before will show 
again.</paragraph>
 
 <note id="par_id190920161744074224">The Tabbed and Groupedbar modes are also 
available as compact variants.</note>
 <tip id="par_id190920161744076273">The notebook bar icon size is adjustable in 
<switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME - 
View - Notebookbar icon size</menuitem> listbox.</tip>
@@ -84,7 +85,7 @@
 <warning id="par_id190920161744078275">The current implementation 
(%PRODUCTNAME %PRODUCTVERSION) of the notebook bar is common to Writer, Calc, 
Draw and Impress modules. A change in the notebook bar in one module will 
affect the notebook bar of the other modules.</warning>
 
 <section id="relatedtopics">
-<paragraph id="par_id190920161744072842" role="paragraph" 
xml-lang="en-US"><link 
href="text/shared/guide/floating_toolbar.xhp">Toolbars</link></paragraph>
+<paragraph id="par_id190920161744072842" role="paragraph"><link 
href="text/shared/guide/floating_toolbar.xhp">Toolbars</link></paragraph>
 <paragraph role="paragraph" id="par_id921589901261168"><link 
href="text/shared/optionen/01010800.xhp">View</link> options</paragraph>
 </section>
 </body>
diff --git a/source/text/swriter/00/00000403.xhp 
b/source/text/swriter/00/00000403.xhp
index 2bf1b477c0..eb67602532 100644
--- a/source/text/swriter/00/00000403.xhp
+++ b/source/text/swriter/00/00000403.xhp
@@ -80,25 +80,46 @@
 </section>
 
 <section id="webbrowser">
-<paragraph id="par_id3149712" role="paragraph" xml-lang="en-US">Choose 
<menuitem>View - Web</menuitem></paragraph>
-<paragraph id="par_id3154640" role="paragraph" xml-lang="en-US">On 
<emph>Tools</emph> bar, enable</paragraph>
-<section id="sybrowser">
-<table id="tbl_id3151264">
-  <tablerow>
-    <tablecell>
-        <paragraph id="par_id3150765" role="paragraph" xml-lang="en-US"> 
<image id="img_id3147572" src="cmd/lc_browseview.svg" width="1cm" 
height="1cm"><alt xml-lang="en-US" id="alt_id3147572">Web 
Icon</alt></image></paragraph>
-    </tablecell>
-    <tablecell>
-      <paragraph id="par_id3149291" role="paragraph" 
xml-lang="en-US">Web</paragraph>
-    </tablecell>
-  </tablerow>
-</table>
-</section>
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph id="par_id3149712" role="paragraph" xml-lang="en-US">Choose 
<menuitem>View - Web</menuitem></paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+  <paragraph role="paragraph" id="par_id731686340717333">Choose <menuitem>View 
- Web view</menuitem>.</paragraph>
+  <paragraph role="paragraph" id="par_id711686340723589">On the 
<menuitem>View</menuitem> menu, choose <menuitem>Web</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+  <section id="sybrowser">
+    <table id="tbl_id3151264">
+      <tablerow>
+        <tablecell>
+          <paragraph id="par_id3150765" role="paragraph" xml-lang="en-US"> 
<image id="img_id3147572" src="cmd/lc_browseview.svg" width="1cm" 
height="1cm"><alt xml-lang="en-US" id="alt_id3147572">Web 
Icon</alt></image></paragraph>
+        </tablecell>
+        <tablecell>
+          <paragraph id="par_id3149291" role="paragraph" 
xml-lang="en-US">Web</paragraph>
+        </tablecell>
+      </tablerow>
+    </table>
+  </section>
+  <embed href="text/shared/00/00000004.xhp#from_keyboard"/>
 </section>
 
 <section id="normal_layout">
-<paragraph id="par_id3151176" role="paragraph" xml-lang="en-US">Choose 
<menuitem>View - Normal</menuitem><comment>removed table with icon (was 
copy/paste error)</comment></paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph id="par_id3151176" role="paragraph" xml-lang="en-US">Choose 
<menuitem>View - Normal</menuitem><comment>removed table with icon (was 
copy/paste error)</comment></paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+  <paragraph role="paragraph" id="par_id261686340093283">Choose <menuitem>View 
- Normal view</menuitem>.</paragraph>
+  <paragraph role="paragraph" id="par_id131686340441662">On the 
<menuitem>View</menuitem> menu, choose <menuitem>Normal 
View</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+  <table id="tab_id511686340286034">
+    <tablerow>
+      <tablecell>
+        <paragraph id="par_id831686340286035" role="paragraph"><image 
src="cmd/lc_printlayout.svg" id="img_id131686340286036" width="1cm"  
height="1cm"><alt id="alt_id581686340286037">Icon Normal 
View</alt></image></paragraph>
+      </tablecell>
+      <tablecell>
+        <paragraph id="par_id191686340286039" role="paragraph">Normal 
View</paragraph>
+      </tablecell>
+    </tablerow>
+  </table>
 </section>
+
 <paragraph id="par_id3149808" role="paragraph" xml-lang="en-US"><variable 
id="hidden_para">Choose <menuitem>View - Hidden Paragraphs</menuitem> 
</variable></paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/swriter/01/03120000.xhp 
b/source/text/swriter/01/03120000.xhp
index d3248eccfd..a79c45180f 100644
--- a/source/text/swriter/01/03120000.xhp
+++ b/source/text/swriter/01/03120000.xhp
@@ -20,7 +20,7 @@
 
 <meta>
   <topic id="textswriter0103120000xml" indexer="include" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">Web Layout</title>
+    <title id="tit">Web Layout</title>
     <filename>/text/swriter/01/03120000.xhp</filename>
   </topic>
 </meta>
@@ -29,10 +29,10 @@
 
 
 <section id="web_layout">
-<bookmark xml-lang="en-US" branch="hid/.uno:BrowseView" id="bm_id374616" 
localize="false"/>
+<bookmark branch="hid/.uno:BrowseView" id="bm_id374616" localize="false"/>
 
 <h1 id="hd_id3145243"><link href="text/swriter/01/03120000.xhp">Web 
Layout</link></h1>
-<paragraph id="par_id3154646" role="paragraph" xml-lang="en-US"><variable 
id="web_layout_text"><ahelp hid=".">Displays the document as it would be viewed 
in a Web browser.</ahelp> This is useful when you create HTML 
documents.</variable></paragraph>
+<paragraph id="par_id3154646" role="paragraph"><variable 
id="web_layout_text"><ahelp hid=".">Displays the document as it would be viewed 
in a Web browser.</ahelp> This is useful when you create HTML 
documents.</variable></paragraph>
 </section>
 
 <section id="howtoget">
diff --git a/source/text/swriter/01/03130000.xhp 
b/source/text/swriter/01/03130000.xhp
index 1c02f85a80..a1e55b14d1 100644
--- a/source/text/swriter/01/03130000.xhp
+++ b/source/text/swriter/01/03130000.xhp
@@ -20,7 +20,7 @@
 
 <meta>
   <topic id="textswriter0103130000xml" indexer="include" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">Normal Layout</title>
+    <title id="tit">Normal Layout</title>
     <filename>/text/swriter/01/03130000.xhp</filename>
   </topic>
 </meta>
@@ -29,10 +29,9 @@
 
 
 <section id="normal_layout">
-<bookmark xml-lang="en-US" branch="hid/.uno:PrintLayout" id="bm_id8907078" 
localize="false"/>
-
+<bookmark branch="hid/.uno:PrintLayout" id="bm_id8907078" localize="false"/>
 <h1 id="hd_id3150018"><link href="text/swriter/01/03130000.xhp">Normal 
Layout</link></h1>
-<paragraph id="par_id3145249" role="paragraph" xml-lang="en-US"><variable 
id="normal_layout_text"><ahelp hid=".">Displays how the document will look when 
you print it.</ahelp></variable></paragraph>
+<paragraph id="par_id3145249" role="paragraph"><ahelp hid=".">Displays how the 
document will look when you print it.</ahelp></paragraph>
 </section>
 
 <section id="howtoget">
@@ -40,4 +39,4 @@
 </section>
 </body>
 
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/source/text/swriter/main0103.xhp b/source/text/swriter/main0103.xhp
index c32194e9bb..ba80f62424 100644
--- a/source/text/swriter/main0103.xhp
+++ b/source/text/swriter/main0103.xhp
@@ -33,12 +33,10 @@
 <paragraph id="par_id3147249" role="paragraph" xml-lang="en-US"><ahelp 
hid=".">This menu contains commands to control the on-screen display of the 
document, change the user interface and access the sidebar 
panels.</ahelp></paragraph>
 </section>
 
-<h2 id="par_id102720150703473580"><link 
href="text/swriter/01/03130000.xhp">Normal</link></h2>
-<embed href="text/swriter/01/03130000.xhp#normal_layout_text"/>
-
-<h2 id="par_id102720150703478401"><link 
href="text/swriter/01/03120000.xhp">Web</link></h2>
-<embed href="text/swriter/01/03120000.xhp#web_layout_text"/>
+<embed href="text/swriter/01/03130000.xhp#normal_layout"/>
+<embed href="text/swriter/01/03120000.xhp#web_layout"/>
 <embed href="text/shared/01/notebook_bar.xhp#using_the_notebook_bar"/>
+
 <embed href="text/shared/02/19090000.xhp#htmlsource"/>
 <embed href="text/shared/01/03990000.xhp#toolbars"/>
 <embed href="text/shared/01/03060000.xhp#status_bar"/>
diff --git a/source/text/swriter/main0203.xhp b/source/text/swriter/main0203.xhp
index 67bf13b955..297fbcbf24 100644
--- a/source/text/swriter/main0203.xhp
+++ b/source/text/swriter/main0203.xhp
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><helpdocument version="1.0">
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -19,15 +20,15 @@
  
 <meta>
 <topic id="textswritermain0203xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Image Bar</title>
+<title id="tit">Image Bar</title>
 <filename>/text/swriter/main0203.xhp</filename>
 </topic>
 </meta>
 <body>
 <section id="image_bar">
-<bookmark xml-lang="en-US" branch="hid/HID_GRAFIK_TOOLBOX" id="bm_id3154274" 
localize="false"/>
+<bookmark branch="hid/HID_GRAFIK_TOOLBOX" id="bm_id3154274" localize="false"/>
 <h1 id="hd_id3154263"><link href="text/swriter/main0203.xhp">Image 
Bar</link></h1>
-<paragraph id="par_id3147756" role="paragraph" xml-lang="en-US"><ahelp 
hid="HID_GRAFIK_TOOLBOX">The <emph>Image</emph> Bar contains functions for 
formatting and positioning selected bitmap graphics.</ahelp></paragraph>
+<paragraph id="par_id3147756" role="paragraph"><ahelp 
hid="HID_GRAFIK_TOOLBOX">The <emph>Image</emph> Bar contains functions for 
formatting and positioning selected bitmap graphics.</ahelp></paragraph>
 </section><embed href="text/shared/02/24010000.xhp#filter"/><embed 
href="text/shared/02/24010000.xhp#syfilter"/><embed 
href="text/shared/02/24020000.xhp#graphics_mode"/><embed 
href="text/shared/02/24020000.xhp#sygraphics_mode"/><embed 
href="text/shared/02/colortoolbar.xhp#color"/><embed 
href="text/shared/02/24090000.xhp#transparency"/><embed 
href="text/shared/02/24090000.xhp#sytransparency"/>
 <h2 id="hd_id3145606"><link href="text/swriter/01/05060300.xhp">Flip 
Vertically</link></h2><embed href="text/swriter/01/05060300.xhp#vertikaltext"/>
 <h2 id="hd_id3145639"><link href="text/swriter/01/05060300.xhp">Flip 
Horizontally</link></h2><embed 
href="text/swriter/01/05060300.xhp#horizontaltext"/>

Reply via email to