Fix <embedvar> tags for better l10n (Part 1)

This is Part 1 of the fixes requested by translators concerning the use of the <embedvar>. Change-Id: Iee5ea4289034449c33156d4e20483943eb872ae0 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/123782 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
author: Rafael Lima <rafael.palma.lima@gmail.com> 2021-10-19 15:52:52 +0200
committer: Olivier Hallot <olivier.hallot@libreoffice.org> 2021-10-21 20:00:22 +0200
commit: f025640e2603ee252a21e935c2790627a2e95224 (patch)
tree: aacfef8cdf2f067d7489c3dec5de04e5f2e62468
parent: 993399c7c55d58bf084234713b07ac6ef8442b03 (diff)
18 files changed, 393 insertions, 393 deletions
diff --git a/source/text/sbasic/shared/03/lib_ScriptForge.xhp b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
index 7e68911692..466532b1d5 100644
--- a/source/text/sbasic/shared/03/lib_ScriptForge.xhp
+++ b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
@@ -1,33 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-    <!--
-    * This file is part of the LibreOffice project.
-    *
-    * This Source Code Form is subject to the terms of the Mozilla Public
-    * License, v. 2.0. If a copy of the MPL was not distributed with this
-    * file, You can obtain one at http://mozilla.org/MPL/2.0/.
-    *
-    -->
-    <meta>
-        <topic id="toolsbasiclibrary" indexer="include" status="PUBLISH">
-            <title id="tit" xml-lang="en-US">ScriptForge Libraries</title>
-            <filename>/text/sbasic/shared/03/lib_ScriptForge.xhp</filename>
-        </topic>
-    </meta>
-    <body>
-    <h1 id="hd_id31529004750471" xml-lang="en-US"><variable id="ScriptForge_lib"><link href="text/sbasic/shared/03/lib_ScriptForge.xhp" name="ScriptForge library">The <literal>ScriptForge</literal> Library</link></variable></h1>
-    <bookmark xml-lang="en-US" branch="index" id="bm_id491529070339774">
-        <bookmark_value>BASIC ScriptForge library</bookmark_value>
-        <bookmark_value>Python scriptforge module</bookmark_value>
-    </bookmark>
-    <section id="howtoget">
-        <embed href="text/sbasic/shared/00000003.xhp#basiclibhowtoget"/>
-    </section>
+<!--
+* This file is part of the LibreOffice project.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*
+-->
+
+<meta>
+  <topic id="toolsbasiclibrary" indexer="include" status="PUBLISH">
+    <title id="tit" xml-lang="en-US">ScriptForge Libraries</title>
+    <filename>/text/sbasic/shared/03/lib_ScriptForge.xhp</filename>
+  </topic>
+</meta>
+<body>
+  <h1 id="hd_id31529004750471" xml-lang="en-US"><variable id="ScriptForge_lib"><link href="text/sbasic/shared/03/lib_ScriptForge.xhp" name="ScriptForge library">The <literal>ScriptForge</literal> Library</link></variable></h1>
+  <bookmark xml-lang="en-US" branch="index" id="bm_id491529070339774">
+    <bookmark_value>BASIC ScriptForge library</bookmark_value>
+    <bookmark_value>Python scriptforge module</bookmark_value>
+  </bookmark>
+  <section id="howtoget">
+    <embed href="text/sbasic/shared/00000003.xhp#basiclibhowtoget"/>
+  </section>
     <paragraph role="paragraph" id="par_id681619700336879">ScriptForge libraries build up an extensible collection of macro scripting resources for %PRODUCTNAME to be invoked from Basic macros or Python scripts.</paragraph>
     <note id="par_id901528999850603" localize="false">&#8226; Basic macros require to load <literal>ScriptForge</literal> library using the following statement:<br/>   <literal>GlobalScope.BasicLibraries.LoadLibrary("ScriptForge")</literal><br/><br/>&#8226; Python scripts require an import from <literal>scriptforge</literal> module:<br/>
       <literal>from scriptforge import CreateScriptService</literal>
     </note>
-    <tip id="par_id1001623412767893">To learn more about how to create and execute Python scripts using the <literal>ScriptForge</literal> library, read the <embedvar href="text/sbasic/shared/03/sf_intro.xhp#title"/> help page.</tip>
+  <tip id="par_id1001623412767893">To learn more about how to create and execute Python scripts using the <literal>ScriptForge</literal> library, read the help page <link href="text/sbasic/shared/03/sf_intro.xhp" name="sfintro_link">Creating Python Scripts with ScriptForge</link>.</tip>
     <paragraph role="paragraph" id="par_id781606153472028">The described modules and classes are invoked from user scripts as "Services". A generic constructor of those services has been designed for that purpose for each language:</paragraph>
     <bascode>
       <paragraph role="bascode" localize="false" id="bas_id901619770181787">GlobalScope.BasicLibraries.LoadLibrary("ScriptForge")</paragraph>
@@ -101,7 +102,7 @@
        <tablecell>
          <paragraph id="par_id441613885558931" localize="false" role="tablecontent">
            <link href="text/sbasic/shared/03/lib_ScriptForge.xhp#Form" name="Form service">Form</link><br/>
-           <link href="text/sbasic/shared/03/lib_ScriptForge.xhp#FormControl" name="FormControl service">FormControl</link><br/>
+           <link href="text/sbasic/shared/03/lib_ScriptForge.xhp#FormControl" name="FormControl service">FormControl</link><br/><br/>
          </paragraph>
        </tablecell>
     </tablerow>
@@ -194,4 +195,4 @@
       <warning id="par_id851506659675843">All <literal>ScriptForge</literal> Basic routines or identifiers that are prefixed with an underscore character "_" are reserved for internal use. They are not meant be used in Basic macros.</warning>
     </section>
 </body>
-</helpdocument>
-\ No newline at end of file
+</helpdocument>
diff --git a/source/text/sbasic/shared/03/sf_intro.xhp b/source/text/sbasic/shared/03/sf_intro.xhp
index 785a2e06f8..98081e5454 100644
--- a/source/text/sbasic/shared/03/sf_intro.xhp
+++ b/source/text/sbasic/shared/03/sf_intro.xhp
@@ -46,7 +46,7 @@
       <paragraph id="par_id651623412069496" role="listitem"><emph>Debugging:</emph> Whenever an error occurs in Python scripts that use <literal>ScriptForge</literal>, the error message provided by the Python execution stack displays the line of code that triggered the error. In Basic error messages do not display this information.</paragraph>
     </listitem>
   </list>
-  <tip id="par_id31623411828158">Visit <embedvar href="text/sbasic/python/main0000.xhp#pythonscriptshelp"/> for more information on Python scripting using %PRODUCTNAME.</tip>
+  <tip id="par_id31623411828158">Visit <link href="text/sbasic/python/main0000.xhp#" name="pyscripts_link">%PRODUCTNAME Python Scripts Help</link> for more information on Python scripting using %PRODUCTNAME.</tip>
   <h2 id="hd_id391623411150080">Running Python scripts on %PRODUCTNAME</h2>
   <paragraph role="paragraph" id="par_id411623364895100">Depending on what you intend to achieve, you may choose one of the following approaches to running Python scripts in %PRODUCTNAME:</paragraph>
   <list type="unordered">
diff --git a/source/text/sbasic/shared/03/sf_session.xhp b/source/text/sbasic/shared/03/sf_session.xhp
index b2b2758ac5..85ee3f9496 100644
--- a/source/text/sbasic/shared/03/sf_session.xhp
+++ b/source/text/sbasic/shared/03/sf_session.xhp
@@ -16,28 +16,24 @@
   </topic>
 </meta>
 <body>
-
-<section id="abstract">
-  <bookmark xml-lang="en-US" localize="false" branch="index" id="bm_id661582814720399">
-    <bookmark_value>Session service</bookmark_value>
-  </bookmark>
-
-  <h1 id="hd_id901582814720985" xml-lang="en-US"><variable id="SessionService"><link href="text/sbasic/shared/03/sf_session.xhp" name="Session service"><literal>ScriptForge</literal>.<literal>Session</literal> service</link></variable></h1>
-
-  <paragraph role="paragraph" id="par_id861582814720987" xml-lang="en-US">The <literal>Session</literal> service gathers various general-purpose methods about:</paragraph>
-  <list type = "unordered">
-     <listitem>
+  <section id="abstract">
+    <bookmark xml-lang="en-US" localize="false" branch="index" id="bm_id661582814720399">
+      <bookmark_value>Session service</bookmark_value>
+    </bookmark>
+    <h1 id="hd_id901582814720985" xml-lang="en-US"><variable id="SessionService"><link href="text/sbasic/shared/03/sf_session.xhp" name="Session service"><literal>ScriptForge.Session</literal> service</link></variable></h1>
+    <paragraph role="paragraph" id="par_id861582814720987" xml-lang="en-US">The <literal>Session</literal> service gathers various general-purpose methods about:</paragraph>
+    <list type = "unordered">
+      <listitem>
         <paragraph id="par_id34158281472051" role="listitem" xml-lang="en-US">the installation or execution environment</paragraph>
-     </listitem>
-     <listitem>
+      </listitem>
+      <listitem>
         <paragraph id="par_id411582814720361" role="listitem" xml-lang="en-US">UNO introspection</paragraph>
-     </listitem>
-     <comment>** for 7.x ** clipboard management</comment>
-     <listitem>
+      </listitem>
+      <listitem>
         <paragraph id="par_id321582814720863" role="listitem" xml-lang="en-US">the invocation of external scripts or programs</paragraph>
-     </listitem>
-  </list>
-</section>
+      </listitem>
+    </list>
+  </section>
 
   <h2 id="hd_id91582814720116" xml-lang="en-US">Service invocation</h2>
   <embed href="text/sbasic/shared/00000003.xhp#In_Basic"/>
@@ -326,7 +322,7 @@
     <paragraph role="pycode" localize="false" id="pyc_id231626817636935">    odd_list = [v for v in range(v1, v2 + 1) if v % 2 != 0]</paragraph>
     <paragraph role="pycode" localize="false" id="pyc_id901626817637127">    return odd_list</paragraph>
   </pycode>
-  <tip id="par_id751626817335715">Read the help page <embedvar href="text/sbasic/python/python_locations.xhp#pythonlocations1"/> to learn more about where Python scripts can be stored.</tip>
+  <tip id="par_id751626817335715">Read the help page <link href="text/sbasic/python/python_locations.xhp" name="pylocation_link">Python Scripts Organization and Location</link> to learn more about where Python scripts can be stored.</tip>
   <paragraph role="paragraph" id="par_id121626817725471">The following examples show how to call the function <literal>odd_integers</literal> from within Basic and Python scripts.</paragraph>
   <embed href="text/sbasic/shared/00000003.xhp#In_Basic"/>
   <bascode>
diff --git a/source/text/sbasic/shared/03030303.xhp b/source/text/sbasic/shared/03030303.xhp
index 8cecbcf853..d82375bc07 100644
--- a/source/text/sbasic/shared/03030303.xhp
+++ b/source/text/sbasic/shared/03030303.xhp
@@ -59,7 +59,7 @@
 <paragraph id="par_idm1341567920" role="bascode" localize="false">End Sub</paragraph>
 </bascode>
 
-<note id="par_id491610993401822">The <literal>Timer</literal> function measures time in seconds. To measure time in milliseconds use the <embedvar href="text/sbasic/shared/03/sf_timer.xhp#TimerService"/>.</note>
+<note id="par_id491610993401822">The <literal>Timer</literal> function measures time in seconds. To measure time in milliseconds use the <link href="text/sbasic/shared/03/sf_timer.xhp" name="Timer_link">Timer service</link> available in the <literal>ScriptForge</literal> library.</note>
 
 <section id="relatedtopics">
   <embed href="text/sbasic/shared/03/sf_timer.xhp#TimerService"/>
diff --git a/source/text/sbasic/shared/03120102.xhp b/source/text/sbasic/shared/03120102.xhp
index a18c3beb1b..a9d73261ef 100644
--- a/source/text/sbasic/shared/03120102.xhp
+++ b/source/text/sbasic/shared/03120102.xhp
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-    <!--
-    * This file is part of the LibreOffice project.
-    *
-    * This Source Code Form is subject to the terms of the Mozilla Public
-    * License, v. 2.0. If a copy of the MPL was not distributed with this
-    * file, You can obtain one at http://mozilla.org/MPL/2.0/.
-    *
-    * This file incorporates work covered by the following license notice:
-    *
-    *   Licensed to the Apache Software Foundation (ASF) under one or more
-    *   contributor license agreements. See the NOTICE file distributed
-    *   with this work for additional information regarding copyright
-    *   ownership. The ASF licenses this file to you under the Apache
-    *   License, Version 2.0 (the "License"); you may not use this file
-    *   except in compliance with the License. You may obtain a copy of
-    *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-    -->
+<!--
+* This file is part of the LibreOffice project.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*
+* This file incorporates work covered by the following license notice:
+*
+*   Licensed to the Apache Software Foundation (ASF) under one or more
+*   contributor license agreements. See the NOTICE file distributed
+*   with this work for additional information regarding copyright
+*   ownership. The ASF licenses this file to you under the Apache
+*   License, Version 2.0 (the "License"); you may not use this file
+*   except in compliance with the License. You may obtain a copy of
+*   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
 
-    <meta>
-        <topic id="textsbasicshared03120102xml" indexer="include" status="PUBLISH">
-            <title id="tit" xml-lang="en-US">Chr Function</title>
-            <filename>/text/sbasic/shared/03120102.xhp</filename>
-        </topic>
-    </meta>
+<meta>
+  <topic id="textsbasicshared03120102xml" indexer="include" status="PUBLISH">
+    <title id="tit" xml-lang="en-US">Chr Function</title>
+    <filename>/text/sbasic/shared/03120102.xhp</filename>
+  </topic>
+</meta>
 
-    <body>
-    <section id="chr">
-        <bookmark xml-lang="en-US" branch="index" id="bm_id3149205">
-            <bookmark_value>Chr function</bookmark_value>
-        </bookmark>
-        <paragraph id="hd_id3149205" role="heading" level="1" xml-lang="en-US"><link href="text/sbasic/shared/03120102.xhp" name="Chr Function">Chr Function</link></paragraph>
-        <paragraph id="par_id3153311" role="paragraph" xml-lang="en-US">Returns the character that corresponds to the specified character code.</paragraph>
-    </section>
+<body>
+  <section id="chr">
+    <bookmark xml-lang="en-US" branch="index" id="bm_id3149205">
+      <bookmark_value>Chr function</bookmark_value>
+    </bookmark>
+    <paragraph id="hd_id3149205" role="heading" level="1" xml-lang="en-US"><link href="text/sbasic/shared/03120102.xhp" name="Chr Function">Chr Function</link></paragraph>
+    <paragraph id="par_id3153311" role="paragraph" xml-lang="en-US">Returns the character that corresponds to the specified character code.</paragraph>
+  </section>
 
     <embed href="text/sbasic/shared/00000003.xhp#functsyntax"/>
 
@@ -49,7 +49,8 @@
     <paragraph id="par_id3159414" role="paragraph" xml-lang="en-US">Use the <emph>Chr$</emph> function to send special control sequences to a printer or to another output source. You can also use it to insert quotation marks in a string expression.</paragraph>
     <embed href="text/sbasic/shared/00000003.xhp#errorcode"/>
     <embed href="text/sbasic/shared/00000003.xhp#err5"/>
-    <paragraph role="paragraph" id="par_id111552916434071"><embedvar href="text/sbasic/shared/00000003.xhp#err6"/>, when VBA compatibility mode is enabled and expression is greater than 255.</paragraph>
+    <embed href="text/sbasic/shared/00000003.xhp#err6"/>
+    <note id="par_id81634652871848">An overflow error will occur when VBA compatibility mode is enabled and the expression value is greater than 255.</note>
 
     <embed href="text/sbasic/shared/00000003.xhp#functexample"/>
     <bascode>
diff --git a/source/text/scalc/01/func_numbervalue.xhp b/source/text/scalc/01/func_numbervalue.xhp
index 18d9d976a7..b0c8f385e0 100644
--- a/source/text/scalc/01/func_numbervalue.xhp
+++ b/source/text/scalc/01/func_numbervalue.xhp
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-  <!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-  <meta>
-    <topic id="textscalc01func_numbervaluexml" indexer="include" status="PUBLISH">
-      <title xml-lang="en-US" id="tit">NUMBERVALUE </title>
-      <filename>/text/scalc/01/func_numbervalue.xhp</filename>
-    </topic>
-  </meta>
-  <body>
+<!--
+* This file is part of the LibreOffice project.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*
+* This file incorporates work covered by the following license notice:
+*
+*   Licensed to the Apache Software Foundation (ASF) under one or more
+*   contributor license agreements. See the NOTICE file distributed
+*   with this work for additional information regarding copyright
+*   ownership. The ASF licenses this file to you under the Apache
+*   License, Version 2.0 (the "License"); you may not use this file
+*   except in compliance with the License. You may obtain a copy of
+*   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
+
+<meta>
+  <topic id="textscalc01func_numbervaluexml" indexer="include" status="PUBLISH">
+    <title xml-lang="en-US" id="tit">NUMBERVALUE </title>
+    <filename>/text/scalc/01/func_numbervalue.xhp</filename>
+  </topic>
+</meta>
+<body>
     <bookmark xml-lang="en-US" branch="index" id="bm_id3145621">
       <bookmark_value>NUMBERVALUE function</bookmark_value>
     </bookmark>
@@ -35,7 +36,7 @@
     <embed href="text/scalc/00/avail_release.xhp#4.1"/>
     <paragraph xml-lang="en-US" id="par_id3149281" role="paragraph">The input text may be in a locale-dependent or other bespoke format.</paragraph>
     <paragraph role="paragraph" id="par_id381625600941159">The output number is formatted as a valid floating point value and shown using the current cell's number format.</paragraph>
-    <tip id="par_id351625601754290">Refer to the <embedvar href="text/shared/01/05020300.xhp#NumbersLink"/> help page to learn how to change the format of numbers in a cell.</tip>
+    <tip id="par_id351625601754290">Refer to the <link href="text/shared/01/05020300.xhp" name="num_format_link">Numbers / Format</link> help page to learn how to change the format of numbers in a cell.</tip>
     <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
     <paragraph role="code" id="par_id721625602228575">NUMBERVALUE(Text[; Decimal Separator[; Group Separator]])</paragraph>
     <paragraph xml-lang="en-US" id="par_id3154819" role="paragraph"><emph>Text</emph> is a string that contains the number to be converted.</paragraph>
diff --git a/source/text/scalc/guide/numbers_text.xhp b/source/text/scalc/guide/numbers_text.xhp
index 47ce84594c..e63054fb0c 100644
--- a/source/text/scalc/guide/numbers_text.xhp
+++ b/source/text/scalc/guide/numbers_text.xhp
@@ -19,21 +19,21 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-
 <meta>
-      <topic id="textscalcguidenumbers_textxml" indexer="include" status="PUBLISH">
-         <title xml-lang="en-US" id="tit">Converting Text to Numbers</title>
-         <filename>/text/scalc/guide/numbers_text.xhp</filename>
-      </topic>
-   </meta>
-   <body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3145068"><bookmark_value>formats; text as numbers</bookmark_value>
-      <bookmark_value>time format conversion</bookmark_value>
-      <bookmark_value>date formats;conversion</bookmark_value>
-      <bookmark_value>converting;text, into numbers</bookmark_value>
-</bookmark><comment>mw changed "converting;" and added two index entries</comment>
-<h1 id="hd_id0908200901265171"><variable id="numbers_text"><link href="text/scalc/guide/numbers_text.xhp" name="Converting Text to Numbers">Converting Text to Numbers</link>
-</variable></h1>
+  <topic id="textscalcguidenumbers_textxml" indexer="include" status="PUBLISH">
+    <title xml-lang="en-US" id="tit">Converting Text to Numbers</title>
+    <filename>/text/scalc/guide/numbers_text.xhp</filename>
+  </topic>
+</meta>
+
+<body>
+  <bookmark xml-lang="en-US" branch="index" id="bm_id3145068">
+    <bookmark_value>formats; text as numbers</bookmark_value>
+    <bookmark_value>time format conversion</bookmark_value>
+    <bookmark_value>date formats;conversion</bookmark_value>
+    <bookmark_value>converting;text, into numbers</bookmark_value>
+  </bookmark>
+  <h1 id="hd_id0908200901265171"><variable id="numbers_text"><link href="text/scalc/guide/numbers_text.xhp" name="Converting Text to Numbers">Converting Text to Numbers</link></variable></h1>
       <section id="text">
          <paragraph xml-lang="en-US" id="par_id0908200901265127" role="paragraph">Defaults settings in Calc converts text inside cells to the respective numeric values if an unambiguous conversion is possible. If no conversion is possible, Calc returns a #VALUE! error.</paragraph>
          <paragraph xml-lang="en-US" id="par_id0908200901265196" role="paragraph"><emph>Only integer numbers including exponent are converted</emph>, and ISO 8601 dates and times in their extended formats with separators. Anything else, like fractional numbers with decimal separators or dates other than ISO 8601, is not converted, as the text string would be locale dependent. Leading and trailing blanks are ignored.</paragraph>
@@ -81,7 +81,7 @@
          <paragraph role="paragraph" id="par_id611567607779380"><literal>=SUM("1E2";1)</literal> returns #VALUE! because SUM() and some others that iterate over number sequences explicitly check the argument type.</paragraph>
       </section>
      <h2 id="hd_id871567772424915">Changing the default text to number conversion settings</h2>
-      <paragraph role="paragraph" id="par_id111567772433803">The text to number conversion can be customized in the <embedvar href="text/shared/optionen/detailedcalculation.xhp#detailed_heading" markup="ignore"/> option.</paragraph>
+     <paragraph role="paragraph" id="par_id111567772433803">The text to number conversion can be customized in the <link href="text/shared/optionen/detailedcalculation.xhp" name="detailed_link">Detailed Calculation Settings</link> option.</paragraph>
       <section id="relatedtopics">
         <embed href="text/shared/optionen/detailedcalculation.xhp#detailed_heading"/>
          <embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
diff --git a/source/text/scalc/guide/remove_duplicates.xhp b/source/text/scalc/guide/remove_duplicates.xhp
index 360ef28616..812f261539 100644
--- a/source/text/scalc/guide/remove_duplicates.xhp
+++ b/source/text/scalc/guide/remove_duplicates.xhp
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -38,7 +37,7 @@
     <paragraph id="par_id631630021463659" role="listitem">Select the range of values from which duplicate values are to be removed. The values have to be arranged in a single column.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id31630021517873" role="listitem">Go to <menuitem>Data - More Filters - Standard Filter</menuitem>. This opens the <embedvar href="text/shared/02/12090100.xhp#StandardFilter_h1"/> dialog.</paragraph>
+    <paragraph id="par_id31630021517873" role="listitem">Go to <menuitem>Data - More Filters - Standard Filter</menuitem>. This opens the <link href="text/shared/02/12090100.xhp" name="std_dialog_link"> Standard Filter</link> dialog.</paragraph>
   </listitem>
   <listitem>
     <paragraph id="par_id801630022108301" role="listitem">In <emph>Field Name</emph> make sure that the selected column is the column where the values are stored. If a single column is selected this field will be set automatically.</paragraph>
diff --git a/source/text/scalc/guide/table_cellmerge.xhp b/source/text/scalc/guide/table_cellmerge.xhp
index d5f788f7f2..fe16ebb63f 100644
--- a/source/text/scalc/guide/table_cellmerge.xhp
+++ b/source/text/scalc/guide/table_cellmerge.xhp
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,36 +17,35 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
- 
-	
+
 <meta>
-      <topic id="textscalcguidetable_cellmergexml" indexer="include" status="PUBLISH">
-         <title xml-lang="en-US" id="tit">Merge and Unmerge Cells</title>
-         <filename>/text/scalc/guide/table_cellmerge.xhp</filename>
-      </topic>
-   </meta>
-   <body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id501632012952361">
-      <bookmark_value>merge/merging cells</bookmark_value>
-      <bookmark_value>unmerge/unmerging cells</bookmark_value>
-      <bookmark_value>split/splitting cells</bookmark_value>
-</bookmark>
-<section id="merge_unmerge_cells">
-<paragraph xml-lang="en-US" id="hd_id8005005" role="heading" level="1"><variable id="table_cellmerge"><link href="text/scalc/guide/table_cellmerge.xhp" name="Merging and Unmerging Cells">Merge and Unmerge Cells</link>
-</variable></paragraph>
-      <paragraph xml-lang="en-US" id="par_id8049867" role="paragraph">You can select a range of cells, then merge them into a single cell. Conversely, you can take a previously merged cell and divide it back into individual cells.</paragraph>
-</section>
-      <paragraph xml-lang="en-US" id="par_id0509200913480176" role="note">When you copy cells into a target range containing merged cells, the target range gets unmerged first, then the copied cells are pasted in. If the copied cells are merged cells, they retain their merge state.</paragraph>
-      <paragraph xml-lang="en-US" id="hd_id235602" role="heading" level="2">Merge Cells</paragraph>
-      <embed href="/text/scalc/01/05060000.xhp#mergecells_warning"/>
-      <section id="howtoget">
+  <topic id="textscalcguidetable_cellmergexml" indexer="include" status="PUBLISH">
+    <title xml-lang="en-US" id="tit">Merge and Unmerge Cells</title>
+    <filename>/text/scalc/guide/table_cellmerge.xhp</filename>
+  </topic>
+</meta>
+<body>
+  <bookmark xml-lang="en-US" branch="index" id="bm_id501632012952361">
+    <bookmark_value>merge/merging cells</bookmark_value>
+    <bookmark_value>unmerge/unmerging cells</bookmark_value>
+    <bookmark_value>split/splitting cells</bookmark_value>
+  </bookmark>
+  <section id="merge_unmerge_cells">
+    <paragraph xml-lang="en-US" id="hd_id8005005" role="heading" level="1"><variable id="table_cellmerge"><link href="text/scalc/guide/table_cellmerge.xhp" name="Merging and Unmerging Cells">Merge and Unmerge Cells</link></variable></paragraph>
+    <paragraph xml-lang="en-US" id="par_id8049867" role="paragraph">You can select a range of cells, then merge them into a single cell. Conversely, you can take a previously merged cell and divide it back into individual cells.</paragraph>
+  </section>
+  <paragraph xml-lang="en-US" id="par_id0509200913480176" role="note">When you copy cells into a target range containing merged cells, the target range gets unmerged first, then the copied cells are pasted in. If the copied cells are merged cells, they retain their merge state.</paragraph>
+  <paragraph xml-lang="en-US" id="hd_id235602" role="heading" level="2">Merge Cells</paragraph>
+  <embed href="/text/scalc/01/05060000.xhp#mergecells_warning"/>
+
+  <section id="howtoget">
       <paragraph xml-lang="en-US" id="par_id1272927" role="paragraph">Click and drag to select the cells to be merged then do one of the following:</paragraph>
       <paragraph role="paragraph" id="par_id221632803290526" xml-lang="en-US">In the Formatting toolbar click:</paragraph>
       <embed href="text/swriter/00/00000405.xhp#symerge_cells"/>
       <paragraph role="paragraph" id="par_id3154351" xml-lang="en-US">Or, right click the selection to open the context menu and choose <menuitem>Merge Cells</menuitem>.<br/>If <menuitem>Unmerge Cells</menuitem> is present instead then the cell selection contains merged cells and cannot be merged further.</paragraph>
       <paragraph role="paragraph" id="par_id931632803442925" xml-lang="en-US">Or, in the <emph>Properties</emph> sidebar mark the <emph>Merge Cells</emph> checkbox.</paragraph>
-      <paragraph role="paragraph" id="par_id3154020" xml-lang="en-US">Or, choose <embedvar href="text/scalc/01/05060000.xhp#format_mergecells_menu"/><menuitem>Merge Cells</menuitem></paragraph>
-      <paragraph xml-lang="en-US" id="par_id6424146" role="listitem">Or, choose <embedvar href="text/scalc/01/05060000.xhp#format_mergecells_menu"/><menuitem>Merge and Center Cells</menuitem></paragraph>
+      <paragraph role="paragraph" id="par_id3154020" xml-lang="en-US">Or, choose <menuitem>Format - Merge and Unmerge Cells - Merge Cells</menuitem></paragraph>
+      <paragraph xml-lang="en-US" id="par_id6424146" role="listitem">Or, choose <menuitem>Format - Merge and Unmerge Cells - Merge and Center Cells</menuitem></paragraph>
       <paragraph xml-lang="en-US" id="par_id961632012538771" role="listitem">The cells will be merged and the content will be centered in the merged cell.</paragraph>
       </section>
       <embed href="text/scalc/01/05060000.xhp#mergenotes"/>
@@ -58,13 +56,15 @@
       <embed href="text/swriter/00/00000405.xhp#sysplit_cells"/>
       <paragraph xml-lang="en-US" id="par_id431632277778130" role="paragraph">Or, right click the selection to open the context menu and choose <menuitem>Unmerge Cells</menuitem>.<br/>If <menuitem>Merge Cells</menuitem> is present instead then the selection does not contain any merged cells.</paragraph>
       <paragraph xml-lang="en-US" id="par_id261632277824041" role="paragraph">Or, in the <emph>Properties</emph> sidebar clear the <emph>Merge Cells</emph> checkbox.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id9493087" role="listitem">Or, choose <embedvar href="text/scalc/01/05060000.xhp#format_mergecells_menu"/><menuitem>Unmerge Cells</menuitem>.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id561632820960500" role="paragraph">Or, toggle <embedvar href="text/scalc/01/05060000.xhp#format_mergecells_menu"/><menuitem>Merge and Center Cells</menuitem></paragraph>
-      </section>
-      <embed href="text/shared/00/00000004.xhp#related"/>
-      <embed href="text/shared/01/05100100.xhp#mergecells"/>
-      <embed href="text/scalc/01/05060000.xhp#togglemergecells"/>
-      <embed href="text/shared/01/05100200.xhp#unmergecells"/>
-      <embed href="text/scalc/guide/cellreferences.xhp#cellreferences"/>
-   </body>
-</helpdocument>
-\ No newline at end of file
+      <paragraph xml-lang="en-US" id="par_id9493087" role="listitem">Or, choose <menuitem>Format - Merge and Unmerge Cells - Unmerge Cells</menuitem>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id561632820960500" role="paragraph">Or, toggle <menuitem>Format - Merge and Unmerge Cells - Merge and Center Cells</menuitem></paragraph>
+  </section>
+
+  <section id="relatedtopics">
+    <embed href="text/shared/01/05100100.xhp#mergecells"/>
+    <embed href="text/scalc/01/05060000.xhp#togglemergecells"/>
+    <embed href="text/shared/01/05100200.xhp#unmergecells"/>
+    <embed href="text/scalc/guide/cellreferences.xhp#cellreferences"/>
+  </section>
+  </body>
+</helpdocument>
diff --git a/source/text/scalc/main0200.xhp b/source/text/scalc/main0200.xhp
index 14bcdbaae1..751ac47604 100644
--- a/source/text/scalc/main0200.xhp
+++ b/source/text/scalc/main0200.xhp
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -16,58 +17,57 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-<helpdocument version="1.0">
+
 <meta>
-<topic id="textscalcmain0200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Toolbars</title>
-<filename>/text/scalc/main0200.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
+  <topic id="textscalcmain0200xml" indexer="include" status="PUBLISH">
+    <title id="tit" xml-lang="en-US">Toolbars</title>
+    <filename>/text/scalc/main0200.xhp</filename>
+  </topic>
+  <history>
+    <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
+  </history>
 </meta>
+
 <body>
-<section id="toolbars">
-<h1 id="hd_id3154758"><variable id="main0200"><link href="text/scalc/main0200.xhp" name="Toolbars">Toolbars</link>
-</variable></h1>
-<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US">This submenu lists the toolbars that are available in spreadsheets.<embedvar href="text/shared/00/00000007.xhp#symbolleistenneu"/>
-</paragraph>
-</section>
-<section id="Section1">
-<embed href="text/shared/main0201.xhp#standardbar"/>
-</section>
-<section id="Section2">
-<embed href="text/scalc/main0202.xhp#imnormalmodus"/>
-</section>
-<section id="Section3">
-<embed href="text/scalc/main0218.xhp#toolsbar"/>
-</section>
-<section id="Section4">
-<embed href="text/scalc/main0206.xhp#rechenleiste"/>
-</section>
-<section id="Section33">
-<embed href="text/simpress/main0210.xhp#drawingbar"/>
-</section>
-<section id="Section5">
-<embed href="text/scalc/main0214.xhp#imagebar"/>
-</section>
-<section id="Section6">
-<embed href="text/scalc/main0203.xhp#beiselektiertemobjekt"/>
-</section>
-<section id="Section7">
-<embed href="text/scalc/main0205.xhp#beitextcursorinobjekt"/>
-</section>
-<section id="Section9">
-<embed href="text/scalc/main0210.xhp#seitenansichtleiste"/>
-</section>
-<section id="Section12">
-<embed href="text/scalc/main0208.xhp#status_bar"/>
-</section>
-<section id="Section8">
-<embed href="text/scalc/02/18010000.xhp#insert"/>
-</section>
-<section id="Section10">
-<embed href="text/shared/01/classificationbar.xhp#toolbar"/>
-</section>
+  <section id="toolbars">
+    <h1 id="hd_id3154758"><variable id="main0200"><link href="text/scalc/main0200.xhp" name="Toolbars">Toolbars</link></variable></h1>
+    <paragraph role="paragraph" id="par_id3148798" xml-lang="en-US">This submenu lists the toolbars that are available in spreadsheets. This overview describes the default toolbar configuration for %PRODUCTNAME.</paragraph>
+  </section>
+  <section id="Section1">
+    <embed href="text/shared/main0201.xhp#standardbar"/>
+  </section>
+  <section id="Section2">
+    <embed href="text/scalc/main0202.xhp#imnormalmodus"/>
+  </section>
+  <section id="Section3">
+    <embed href="text/scalc/main0218.xhp#toolsbar"/>
+  </section>
+  <section id="Section4">
+    <embed href="text/scalc/main0206.xhp#rechenleiste"/>
+  </section>
+  <section id="Section33">
+    <embed href="text/simpress/main0210.xhp#drawingbar"/>
+  </section>
+  <section id="Section5">
+    <embed href="text/scalc/main0214.xhp#imagebar"/>
+  </section>
+  <section id="Section6">
+    <embed href="text/scalc/main0203.xhp#beiselektiertemobjekt"/>
+  </section>
+  <section id="Section7">
+    <embed href="text/scalc/main0205.xhp#beitextcursorinobjekt"/>
+  </section>
+  <section id="Section9">
+    <embed href="text/scalc/main0210.xhp#seitenansichtleiste"/>
+  </section>
+  <section id="Section12">
+    <embed href="text/scalc/main0208.xhp#status_bar"/>
+  </section>
+  <section id="Section8">
+    <embed href="text/scalc/02/18010000.xhp#insert"/>
+  </section>
+  <section id="Section10">
+    <embed href="text/shared/01/classificationbar.xhp#toolbar"/>
+  </section>
 </body>
 </helpdocument>
diff --git a/source/text/shared/01/05030500.xhp b/source/text/shared/01/05030500.xhp
index 2394b823c3..8053f617d1 100644
--- a/source/text/shared/01/05030500.xhp
+++ b/source/text/shared/01/05030500.xhp
@@ -19,18 +19,19 @@
  -->
 
 <meta>
-<topic id="textshared0105030500xml" indexer="include" status="PUBLISH">
-  <title id="tit" xml-lang="en-US">Borders</title>
-  <filename>/text/shared/01/05030500.xhp</filename>
-</topic>
+  <topic id="textshared0105030500xml" indexer="include" status="PUBLISH">
+    <title id="tit" xml-lang="en-US">Borders</title>
+    <filename>/text/shared/01/05030500.xhp</filename>
+  </topic>
 </meta>
 <body>
-<section id="borders">
-<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/BorderPage" id="bm_id3150756" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/@@nowidget@@" id="bm_id3150756" localize="false"/>
-<h1 id="hd_id3154812" xml-lang="en-US"><link href="text/shared/01/05030500.xhp" name="Borders">Borders</link></h1>
-<paragraph role="paragraph" id="par_id3151097" xml-lang="en-US"><ahelp hid="cui/ui/borderpage/BorderPage">Sets the border options for the selected objects in Writer or Calc.</ahelp></paragraph>
-</section>
+  <section id="borders">
+    <bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/BorderPage" id="bm_id3150756" localize="false"/>
+    <bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/@@nowidget@@" id="bm_id3150756" localize="false"/>
+    <h1 id="hd_id3154812" xml-lang="en-US"><link href="text/shared/01/05030500.xhp" name="Borders">Borders</link></h1>
+    <paragraph role="paragraph" id="par_id3151097" xml-lang="en-US"><ahelp hid="cui/ui/borderpage/BorderPage">Sets the border options for the selected objects in Writer or Calc.</ahelp></paragraph>
+  </section>
+
 <paragraph role="paragraph" id="par_id3155351" xml-lang="en-US">You can specify the border position, size, and style in Writer or Calc. <switchinline select="appl"><caseinline select="WRITER">In $[officename] Writer, you can add borders to pages, frames, graphics, tables, paragraphs, characters and to embedded objects.
 </caseinline></switchinline></paragraph>
 <section id="howtoget">
@@ -49,7 +50,7 @@
 <switch select="appl">
   <case select="CALC">
     <paragraph role="paragraph" id="par_id591630450693398">The <emph>Remove border</emph> option in the <emph>Adjacent Cells</emph> section determines if borders in the edges of the selected range are to be removed. Leave this option unchecked if edge borders should be left unchanged.</paragraph>
-    <tip id="par_id181630450040456">Read the help page <embedvar href="text/scalc/guide/borders.xhp#borders"/> to learn more on how to define custom line arrangements.</tip>
+    <tip id="par_id181630450040456">Read the help page <link href="text/scalc/guide/borders.xhp">User Defined Borders in Cells</link> to learn more on how to define custom line arrangements.</tip>
   </case>
 </switch>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/linestylelb" id="bm_id3153896" localize="false"/><paragraph role="heading" id="hd_id3149575" xml-lang="en-US" level="2">Line</paragraph>
@@ -95,17 +96,18 @@
 <embed href="text/shared/00/00000001.xhp#reset"/>
 <comment>Calc does not have an Apply button</comment>
 <switch select="appl"><case select="WRITER"><embed href="text/shared/00/00000001.xhp#apply"/></case></switch>
-<section id="relatedtopics">
-<switch select="appl">
-<case select="WRITER">
-  <embed href="text/swriter/guide/border_object.xhp#border_object"/><comment>UFI: moved border_object into Writer switch</comment>
-  <embed href="text/swriter/guide/border_page.xhp#border_page"/>
-  <embed href="text/swriter/guide/borders.xhp#borders"/>
-</case>
-</switch>
-<embed href="text/swriter/guide/border_character.xhp#border_character"/>
-<embed href="text/shared/guide/border_paragraph.xhp#border_paragraph"/>
-<embed href="text/shared/guide/border_table.xhp#border_table"/>
-</section>
+
+  <section id="relatedtopics">
+    <switch select="appl">
+      <case select="WRITER">
+        <embed href="text/swriter/guide/border_object.xhp#border_object"/><comment>UFI: moved border_object into Writer switch</comment>
+        <embed href="text/swriter/guide/border_page.xhp#border_page"/>
+        <embed href="text/swriter/guide/borders.xhp#borders"/>
+      </case>
+    </switch>
+    <embed href="text/swriter/guide/border_character.xhp#border_character"/>
+    <embed href="text/shared/guide/border_paragraph.xhp#border_paragraph"/>
+    <embed href="text/shared/guide/border_table.xhp#border_table"/>
+  </section>
 </body>
 </helpdocument>
diff --git a/source/text/shared/01/05070200.xhp b/source/text/shared/01/05070200.xhp
index 39b75d07c0..feac83fce3 100644
--- a/source/text/shared/01/05070200.xhp
+++ b/source/text/shared/01/05070200.xhp
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,25 +17,32 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
- 
-	
+
 <meta>
-<topic id="textshared0105070200xml" indexer="include">
-<title id="tit" xml-lang="en-US">Center Horizontal</title>
-<filename>/text/shared/01/05070200.xhp</filename>
-</topic>
+  <topic id="textshared0105070200xml" indexer="include">
+    <title id="tit" xml-lang="en-US">Center Horizontal</title>
+    <filename>/text/shared/01/05070200.xhp</filename>
+  </topic>
 </meta>
 <body>
-<section id="center_horizontal">
-<bookmark xml-lang="en-US" branch="hid/.uno:AlignCenter" id="bm_id5496441" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:AlignHorizontalCenter" id="bm_id0801200803230775" localize="false"/>
-<paragraph role="heading" id="hd_id3150278" xml-lang="en-US" level="1"><link href="text/shared/01/05070200.xhp" name="Center Horizontal">Center Horizontal</link></paragraph>
-<paragraph role="paragraph" id="par_id3145138" xml-lang="en-US"><ahelp hid=".">Horizontally centers the selected objects. If only one object is selected in Draw or Impress, the center of the object is aligned to the horizontal center of the page.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00040501.xhp#center_horizontal"/>
-</section>
-<paragraph role="paragraph" id="par_id3144336" xml-lang="en-US">The vertical position of the selected objects is not affected by this command.<embedvar href="text/shared/01/05070100.xhp#mehrfachselektion"/>
-</paragraph>
+  <section id="center_horizontal">
+    <bookmark xml-lang="en-US" branch="hid/.uno:AlignCenter" id="bm_id5496441" localize="false"/>
+    <bookmark xml-lang="en-US" branch="hid/.uno:AlignHorizontalCenter" id="bm_id0801200803230775" localize="false"/>
+    <h1 id="hd_id3150278"><link href="text/shared/01/05070200.xhp" name="Center Horizontal">Center Horizontal</link></h1>
+    <paragraph role="paragraph" id="par_id3145138" xml-lang="en-US"><ahelp hid=".">Horizontally centers the selected objects. If only one object is selected in Draw or Impress, the center of the object is aligned to the horizontal center of the page.</ahelp></paragraph>
+  </section>
+  <section id="howtoget">
+    <embed href="text/shared/00/00040501.xhp#center_horizontal"/>
+  </section>
+  <paragraph role="paragraph" id="par_id3144336" xml-lang="en-US">The vertical position of the selected objects is not affected by this command.</paragraph>
+  <switch select="appl">
+    <case select="CALC">
+      <paragraph role="paragraph" id="par_id891634662083611">To align the individual objects in a group, choose <menuitem>Format - Group - Enter Group</menuitem>  to enter the group, select the objects, right-click, and then choose an alignment option.</paragraph>
+    </case>
+    <default>
+      <paragraph role="paragraph" id="par_id81634662074262">To align the individual objects in a group, double-click to enter the group, select the objects, right-click, and then choose an alignment option.</paragraph>
+    </default>
+  </switch>
+
 </body>
 </helpdocument>
diff --git a/source/text/shared/01/05230100.xhp b/source/text/shared/01/05230100.xhp
index 02fbdcbe7b..c284e446ba 100644
--- a/source/text/shared/01/05230100.xhp
+++ b/source/text/shared/01/05230100.xhp
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<helpdocument version="1.0">
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,34 +18,36 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<helpdocument version="1.0">
 <meta>
-<topic id="textshared0105230100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Position and Size (Text Box and Shape)</title>
-<filename>/text/shared/01/05230100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
+  <topic id="textshared0105230100xml" indexer="include" status="PUBLISH">
+    <title id="tit" xml-lang="en-US">Position and Size (Text Box and Shape)</title>
+    <filename>/text/shared/01/05230100.xhp</filename>
+  </topic>
+  <history>
+    <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
+  </history>
 </meta>
+
 <body>
-<section id="position">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3154350"><bookmark_value>positioning;draw objects and controls</bookmark_value>
-<bookmark_value>draw objects;positioning and resizing</bookmark_value>
-<bookmark_value>controls; positions and sizes</bookmark_value>
-<bookmark_value>sizes;draw objects</bookmark_value>
-<bookmark_value>anchors;types/positions for draw objects</bookmark_value>
-<bookmark_value>draw objects; anchoring</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/possizetabpage/PositionAndSize" id="bm_id3154185" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/possizetabpage/@@nowidget@@" id="bm_id3154185" localize="false"/>
-<h1 id="hd_id3154350" xml-lang="en-US"><link href="text/shared/01/05230100.xhp" name="Position and Size">Position and Size</link></h1>
-<paragraph role="paragraph" id="par_id3153255" xml-lang="en-US"><ahelp hid=".">Resizes or moves the selected object.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00040502.xhp#Shape_PositionSize"/>
-</section>
-<switch select="appl">
+  <section id="position">
+    <bookmark xml-lang="en-US" branch="index" id="bm_id3154350">
+      <bookmark_value>positioning;draw objects and controls</bookmark_value>
+      <bookmark_value>draw objects;positioning and resizing</bookmark_value>
+      <bookmark_value>controls; positions and sizes</bookmark_value>
+      <bookmark_value>sizes;draw objects</bookmark_value>
+      <bookmark_value>anchors;types/positions for draw objects</bookmark_value>
+      <bookmark_value>draw objects; anchoring</bookmark_value>
+    </bookmark>
+    <bookmark xml-lang="en-US" branch="hid/cui/ui/possizetabpage/PositionAndSize" id="bm_id3154185" localize="false"/>
+    <bookmark xml-lang="en-US" branch="hid/cui/ui/possizetabpage/@@nowidget@@" id="bm_id3154185" localize="false"/>
+    <h1 id="hd_id3154350" xml-lang="en-US"><link href="text/shared/01/05230100.xhp" name="Position and Size">Position and Size</link></h1>
+    <paragraph role="paragraph" id="par_id3153255" xml-lang="en-US"><ahelp hid=".">Resizes or moves the selected object.</ahelp></paragraph>
+  </section>
+
+  <section id="howtoget">
+    <embed href="text/shared/00/00040502.xhp#Shape_PositionSize"/>
+  </section>
+  <switch select="appl">
   <case select="WRITER"></case>
   <default>
 <h2 id="hd_id3158405" xml-lang="en-US">Position</h2>
@@ -145,8 +147,7 @@
   <case select="CALC"><note id="par_id841603276770477"><variable id="AdaptNote">Adapt is only available for Text Boxes. To adapt Shapes to text, use</variable> <menuitem>Format - Object - Text</menuitem>.</note>
   </case>
   <default>
-<note id="par_id591602522244128">
-<embedvar href="text/shared/01/05230100.xhp#AdaptNote"/> <menuitem>Format - Text</menuitem>.</note>
+    <note id="par_id591602522244128">Adapt is only available for Text Boxes. To adapt Shapes to text, use <menuitem>Format - Text</menuitem>.</note>
   </default>
 </switch>
 <section id="relatedtopics">
diff --git a/source/text/shared/01/06040000.xhp b/source/text/shared/01/06040000.xhp
index caf8d84d66..b05d028795 100644
--- a/source/text/shared/01/06040000.xhp
+++ b/source/text/shared/01/06040000.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.
  *
@@ -23,6 +24,7 @@
     <filename>/text/shared/01/06040000.xhp</filename>
   </topic>
 </meta>
+
 <body>
   <bookmark xml-lang="en-US" branch="index" id="bm_id3153391">
     <bookmark_value>AutoCorrect function;switching on and off</bookmark_value>
@@ -37,13 +39,13 @@
   <paragraph id="par_id3147261" role="paragraph" xml-lang="en-US">To apply an AutoCorrect rule, enter the predefined text in the document and press the <widget>Spacebar</widget>.</paragraph>
   <switch select="appl">
     <case select="WRITER">
-      <note id="par_id791632159942582">To turn off AutoCorrect in %PRODUCTNAME Writer choose <menuitem>Tools - AutoCorrect - While Typing</menuitem>. Refer to the help page <embedvar href="text/swriter/guide/auto_off.xhp#auto_off"/> to learn more about deactivating AutoCorrect in %PRODUCTNAME Writer.</note>
+      <note id="par_id791632159942582">To turn off AutoCorrect in %PRODUCTNAME Writer choose <menuitem>Tools - AutoCorrect - While Typing</menuitem>. Refer to the help page <link href="text/swriter/guide/auto_off.xhp" name="auto_off_link1">Turning Off AutoCorrect</link> to learn more about deactivating AutoCorrect in %PRODUCTNAME Writer.</note>
       <tip id="par_id561632160115951">To apply AutoCorrect to an entire text document, choose <menuitem>Tools - AutoCorrect - Apply</menuitem>.</tip>
     </case>
   </switch>
   <switch select="appl">
     <case select="CALC">
-      <note id="par_id911632159367467">To turn off AutoCorrect in %PRODUCTNAME Calc, go to <menuitem>Tools - AutoCorrect Options</menuitem> and uncheck all items in the <emph>Options</emph> and <emph>Localized Options</emph> tabs. Refer to the help page <embedvar href="text/scalc/guide/auto_off.xhp#auto_off"/> to learn more about deactivating AutoCorrect in %PRODUCTNAME Calc.</note>
+      <note id="par_id911632159367467">To turn off AutoCorrect in %PRODUCTNAME Calc, go to <menuitem>Tools - AutoCorrect Options</menuitem> and uncheck all items in the <emph>Options</emph> and <emph>Localized Options</emph> tabs. Refer to the help page <link href="text/swriter/guide/auto_off.xhp" name="auto_off_link2">Turning Off AutoCorrect</link> to learn more about deactivating AutoCorrect in %PRODUCTNAME Calc.</note>
     </case>
   </switch>
   <embed href="text/shared/01/06040200.xhp#replace"/>
diff --git a/source/text/shared/explorer/database/rep_main.xhp b/source/text/shared/explorer/database/rep_main.xhp
index e2741d95e2..04362579f1 100644
--- a/source/text/shared/explorer/database/rep_main.xhp
+++ b/source/text/shared/explorer/database/rep_main.xhp
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -19,23 +18,24 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-
 <meta>
-      <topic id="textsharedexplorerdatabaserep_mainxml" indexer="include" status="PUBLISH">
-         <title xml-lang="en-US" id="tit">Report Builder</title>
-         <filename>/text/shared/explorer/database/rep_main.xhp</filename>
-      </topic>
-   </meta>
-   <body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id1614429"><bookmark_value>Report Builder</bookmark_value>
-<bookmark_value>Oracle Report Builder</bookmark_value>
-</bookmark>
-<paragraph xml-lang="en-US" id="hd_id8773155" role="heading" level="1"><variable id="rep_main"><link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link>
+  <topic id="textsharedexplorerdatabaserep_mainxml" indexer="include" status="PUBLISH">
+    <title xml-lang="en-US" id="tit">Report Builder</title>
+    <filename>/text/shared/explorer/database/rep_main.xhp</filename>
+  </topic>
+</meta>
+
+<body>
+  <bookmark xml-lang="en-US" branch="index" id="bm_id1614429">
+    <bookmark_value>Report Builder</bookmark_value>
+    <bookmark_value>Oracle Report Builder</bookmark_value>
+  </bookmark>
+  <paragraph xml-lang="en-US" id="hd_id8773155" role="heading" level="1"><variable id="rep_main"><link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link>
 </variable></paragraph>
-      <paragraph xml-lang="en-US" id="par_id5248573" role="paragraph">The Report Builder is a tool to create your own database reports. Unlike with the <link href="text/shared/autopi/01100000.xhp">Report Wizard</link>, using the Report Builder you can take control to design the report the way you want. The generated report is a Writer document that you can edit, too.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id7128818" role="note">To use the Report Builder, the Report Builder component must be installed. In addition, the Java Runtime Environment (JRE) software must be installed, and this software must be selected in %PRODUCTNAME.</paragraph>
-      <paragraph xml-lang="en-US" id="hd_id556047" role="heading" level="2">To install the JRE software</paragraph>
-      <paragraph xml-lang="en-US" id="par_id4515823" role="paragraph">The Report Builder requires an installed Java Runtime Environment (JRE).</paragraph>
+  <paragraph xml-lang="en-US" id="par_id5248573" role="paragraph">The Report Builder is a tool to create your own database reports. Unlike with the <link href="text/shared/autopi/01100000.xhp">Report Wizard</link>, using the Report Builder you can take control to design the report the way you want. The generated report is a Writer document that you can edit, too.</paragraph>
+  <paragraph xml-lang="en-US" id="par_id7128818" role="note">To use the Report Builder, the Report Builder component must be installed. In addition, the Java Runtime Environment (JRE) software must be installed, and this software must be selected in %PRODUCTNAME.</paragraph>
+  <paragraph xml-lang="en-US" id="hd_id556047" role="heading" level="2">To install the JRE software</paragraph>
+  <paragraph xml-lang="en-US" id="par_id4515823" role="paragraph">The Report Builder requires an installed Java Runtime Environment (JRE).</paragraph>
       <list type="ordered">
          <listitem>
             <paragraph xml-lang="en-US" id="par_id4044312" role="paragraph">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/java.xhp">Advanced</link>.</paragraph>
@@ -98,7 +98,7 @@
             <paragraph xml-lang="en-US" id="par_id7996459" role="paragraph">After selecting the table, press the Tab key to leave the Content box.</paragraph>
          </listitem>
       </list>
-      <paragraph xml-lang="en-US" id="par_id2531815" role="paragraph">The <embedvar href="text/shared/explorer/database/rep_insertfield.xhp#addfields" markup="ignore"/> window opens automatically and shows all fields of the selected table.</paragraph>
+     <paragraph xml-lang="en-US" id="par_id2531815" role="paragraph">The <link href="text/shared/explorer/database/rep_insertfield.xhp" name="add_fields_link">Add fields to report</link> window opens automatically and shows all fields of the selected table.</paragraph>
       <embed href="text/shared/explorer/database/rep_insertfield.xhp#insertfieldstitle"/>
       <comment>Align at Section toolbar</comment>
 <bookmark xml-lang="en-US" branch="hid/.uno:SectionAlignLeft" id="bm_id7889950" localize="false"/>
@@ -132,8 +132,7 @@
       <list type="ordered">
          <listitem>
             <paragraph xml-lang="en-US" id="par_id8286385" role="paragraph">Click the Execute Report icon
-<image id="img_id3380230" src="cmd/sc_executereport.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id3380230">Icon</alt>
-	</image> on the toolbar.</paragraph>
+<image id="img_id3380230" src="cmd/sc_executereport.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id3380230">Icon</alt></image> on the toolbar.</paragraph>
          </listitem>
       </list>
       <paragraph xml-lang="en-US" id="par_id2354197" role="paragraph">A Writer document opens and shows the report you have created, which contains all values of the database table which you have insert.</paragraph>
@@ -144,16 +143,14 @@
       <paragraph xml-lang="en-US" id="par_id8307138" role="paragraph">If you want to edit the Report Builder view, you can change some of its properties.</paragraph>
       <paragraph xml-lang="en-US" id="par_id7138889" role="paragraph">Click in the Details area. Then in the Properties window, change some properties, for example the background color.</paragraph>
       <paragraph xml-lang="en-US" id="par_id9869380" role="paragraph">After finishing, click the Execute Report icon
-<image id="Graphic2" src="cmd/sc_executereport.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt>
-	</image> to create a new report.</paragraph>
+<image id="Graphic2" src="cmd/sc_executereport.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt></image> to create a new report.</paragraph>
       <paragraph xml-lang="en-US" id="par_id12512" role="paragraph">If you close the Report Builder, you will be asked if the report should be saved. Click Yes, give the report a name, and click OK.<comment>report part of Base file?</comment></paragraph>
       <paragraph xml-lang="en-US" id="par_id2676168" role="heading" level="2">Sorting the report</paragraph>
       <paragraph xml-lang="en-US" id="par_id2626422" role="paragraph">Without sorting or grouping, the records will be inserted into the report in the order in which they are retrieved from the database.</paragraph>
       <list type="ordered">
          <listitem>
             <paragraph xml-lang="en-US" id="par_id1743827" role="paragraph">Open the Report Builder view and click the Sorting and Grouping icon
-<image id="img_id9557786" src="cmd/sc_dbsortingandgrouping.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id9557786">Icon</alt>
-	</image> on the toolbar. You see the <link href="text/shared/explorer/database/rep_sort.xhp">Sorting and Grouping</link> dialog.</paragraph>
+<image id="img_id9557786" src="cmd/sc_dbsortingandgrouping.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id9557786">Icon</alt></image> on the toolbar. You see the <link href="text/shared/explorer/database/rep_sort.xhp">Sorting and Grouping</link> dialog.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id4331797" role="paragraph">In the Groups box, click the field which you want as the first sort field, and set the Sorting property.<comment>what meaning has the order of fields / move up down button?</comment></paragraph>
@@ -166,16 +163,14 @@
       <list type="ordered">
          <listitem>
             <paragraph xml-lang="en-US" id="par_id399182" role="paragraph">Open the Report Builder view and click the Sorting and Grouping icon
-<image id="Graphic21" src="cmd/sc_dbsortingandgrouping.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt>
-	</image> on the toolbar. You see the <link href="text/shared/explorer/database/rep_sort.xhp">Sorting and Grouping</link> dialog.</paragraph>
+<image id="Graphic21" src="cmd/sc_dbsortingandgrouping.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt></image> on the toolbar. You see the <link href="text/shared/explorer/database/rep_sort.xhp">Sorting and Grouping</link> dialog.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id7588732" role="paragraph">In the Groups box, open the Group Header list box and select to show a group header.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id95828" role="paragraph">Click the Add Field icon
-<image id="Graphic3" src="cmd/sc_addfield.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt>
-	</image> to open the Add Field window.</paragraph>
+<image id="Graphic3" src="cmd/sc_addfield.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt></image> to open the Add Field window.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id5675527" role="paragraph">Drag-and-drop the field entry that you want to group into the group header section. Then drag-and-drop the remaining fields into the Detail section.</paragraph>
@@ -188,8 +183,7 @@
       <paragraph xml-lang="en-US" id="par_id888698" role="heading" level="2">Updating and printing your data</paragraph>
       <paragraph xml-lang="en-US" id="par_id3394573" role="paragraph">When you insert some new data or edit data in the table, a new report will show the updated data.</paragraph>
       <paragraph xml-lang="en-US" id="par_id7594225" role="paragraph">Click the Reports icon
-<image id="img_id4678487" src="dbaccess/res/reports_32.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id4678487">Icon</alt>
-	</image> and double-click your last saved report. A new Writer document will be created which shows the new data.</paragraph>
+<image id="img_id4678487" src="dbaccess/res/reports_32.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id4678487">Icon</alt></image> and double-click your last saved report. A new Writer document will be created which shows the new data.</paragraph>
       <paragraph xml-lang="en-US" id="par_id8147221" role="paragraph">To print a report, choose <item type="menuitem">File - Print</item> from the Writer document.</paragraph>
    </body>
 </helpdocument>
diff --git a/source/text/shared/explorer/database/rep_prop.xhp b/source/text/shared/explorer/database/rep_prop.xhp
index 6b10e9d108..4817a595bb 100644
--- a/source/text/shared/explorer/database/rep_prop.xhp
+++ b/source/text/shared/explorer/database/rep_prop.xhp
@@ -26,64 +26,61 @@
 </meta>
 
 <body>
-
-
-<paragraph id="hd_id8836939" role="heading" level="1" xml-lang="en-US"><variable id="rep_prop"><link href="text/shared/explorer/database/rep_prop.xhp">Properties</link> </variable></paragraph>
-<paragraph id="par_id2711264" role="paragraph" xml-lang="en-US">The Properties window of the <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link> always shows the properties of the currently selected object in the Report Builder view.</paragraph>
-<paragraph id="par_id1080660" role="tip" xml-lang="en-US">Press Shift-F1 and point with the mouse at an input box to see a help text for this input box.</paragraph>
-<paragraph id="par_id7175817" role="paragraph" xml-lang="en-US">On first start of the Report Builder, the Properties window shows the <emph>Data</emph> tab page for the whole report.</paragraph>
-<paragraph id="par_id9895931" role="paragraph" xml-lang="en-US">Select a table from the Contents list, then press Tab or click outside the input box to leave the input box.</paragraph>
-<paragraph id="par_id3587145" role="paragraph" xml-lang="en-US"><ahelp hid=".">The <embedvar href="text/shared/explorer/database/rep_insertfield.xhp#addfields" markup="ignore"/>  window is shown automatically when you have selected a table in the Contents box and leave that box. You can also click the Add Field icon on the toolbar, or choose <item type="menuitem">View - Add Field</item>.</ahelp></paragraph>
-<paragraph id="par_id6993926" role="paragraph" xml-lang="en-US">The <emph>General</emph> tab page can be used to change the name of the report, and to disable the Page Header or Page Footer areas, among others.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:SelectReport" id="bm_id9044770" localize="false"/>
-<paragraph id="par_id3729361" role="tip" xml-lang="en-US"><ahelp hid=".">To display the <emph>Data</emph> or <emph>General</emph> tab page for the whole report, choose <item type="menuitem">Edit - Select All - Select Report</item>.</ahelp></paragraph><comment>Group keep together</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_GROUPKEEPTOGETHER" id="bm_id5392315" localize="false"/>
-<paragraph id="par_id1768852" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Groups are kept together by page or by column (default). You must enable Keep Together also.</ahelp></paragraph><comment>Page header</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PAGEHEADEROPTION" id="bm_id7852412" localize="false"/>
-<paragraph id="par_id6304818" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Specifies in which context the page header will be printed: on all pages, or not on pages with a report header or footer.</ahelp></paragraph><comment>Page footer</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PAGEFOOTEROPTION" id="bm_id9031952" localize="false"/>
-<paragraph id="par_id401623" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Specifies in which context the page footer will be printed: on all pages, or not on pages with a report header or footer</ahelp></paragraph><comment>Print repeated values</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PRINTREPEATEDVALUES" id="bm_id7956785" localize="false"/>
-<paragraph id="par_id2162236" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Specifies to print repeated values.</ahelp></paragraph>
-<paragraph id="par_id7022003" role="paragraph" xml-lang="en-US">If you click the Page Header or Page Footer area without selecting any object, you see the <emph>General</emph> tab page for that area.</paragraph>
-<paragraph id="par_id7004303" role="paragraph" xml-lang="en-US">You can edit some visual properties for the area.<comment>screen only or also in report?</comment></paragraph><comment>Background color</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_BACKCOLOR" id="bm_id9801324" localize="false"/>
-<paragraph id="par_id2561723" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Sets the background color for the selected object, both on screen and for printing.</ahelp></paragraph><comment>Visible</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_VISIBLE" id="bm_id7446516" localize="false"/>
-<paragraph id="par_id1064485" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">An invisible object is not shown in the executed report. It is still visible in the Report Builder view.</ahelp></paragraph><comment>Height</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_HEIGHT" id="bm_id8859828" localize="false"/>
-<paragraph id="par_id2356028" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Defines the height of the selected object.</ahelp></paragraph><comment>Conditional Print Expression</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_CONDITIONALPRINTEXPRESSION" id="bm_id4359874" localize="false"/>
-<paragraph id="par_id1404461" role="paragraph" xml-lang="en-US"><ahelp hid=".">If the Conditional Print Expression evaluates to TRUE, the selected object will be printed.</ahelp></paragraph><comment>id="par_id2386852" Conditions use the following form:</comment><comment>Background transparent</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_BACKTRANSPARENT" id="bm_id5689565" localize="false"/>
-<paragraph id="par_id7404705" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Specifies whether the background of the selected object is transparent or opaque.</ahelp><comment>just guessing</comment></paragraph>
-<paragraph id="par_id7466963" role="paragraph" xml-lang="en-US">If you click the <emph>Detail</emph> area without selecting any object, you see the <emph>General</emph> tab page for that area.</paragraph>
-<paragraph id="par_id3644215" role="paragraph" xml-lang="en-US">You can specify some properties to fine-tune the way the records are printed.</paragraph><comment>Force New Page</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_FORCENEWPAGE" id="bm_id66225" localize="false"/>
-<paragraph id="par_id3148899" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Force New Page specifies whether the current section and/or the next section is printed on a new page.</ahelp></paragraph><comment>New Row Or Column</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_NEWROWORCOL" id="bm_id3920102" localize="false"/>
-<paragraph id="par_id6164433" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">New Row Or Column specifies, for a multi-column design, whether the current section and/or the next section will be printed on a new row or column.</ahelp></paragraph><comment>Keep together</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_KEEPTOGETHER" id="bm_id8053529" localize="false"/>
-<paragraph id="par_id7405011" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Keep Together specifies to print the current object starting on top of a new page if it doesn't fit on the current page.</ahelp></paragraph>
-<paragraph id="par_id1536606" role="paragraph" xml-lang="en-US">Insert some data fields into the Detail area, or insert other control fields into any area. When you select an inserted field, you can set the properties in the Properties window.</paragraph>
-<paragraph id="par_id9631641" role="paragraph" xml-lang="en-US">For a Label field, you can change the displayed text in the Label input box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PRESERVEIRI" id="bm_id7422711" localize="false"/>
-<paragraph id="par_id7749565" role="paragraph" xml-lang="en-US"><ahelp hid=".">For a picture, you can specify to either insert the picture as a link to a file or only as an embedded object in the Base file. The embedded option increases the size of the Base file, while the link option is not as portable to other computers.</ahelp></paragraph><comment>Position x</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONX" id="bm_id6006958" localize="false"/>
-<paragraph id="par_id4041871" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Set the X Position for the selected object</ahelp><comment>x in pixel or twips? or current measurement units? from origin as on ruler? from elsewhere?</comment></paragraph><comment>Position y</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONY" id="bm_id7606128" localize="false"/>
-<paragraph id="par_id9930722" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Set the Y Position for the selected object</ahelp></paragraph><comment>Width</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_WIDTH" id="bm_id5778374" localize="false"/>
-<paragraph id="par_id5749687" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Sets the width of the selected object.</ahelp></paragraph><comment>Font</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_FONT" id="bm_id3184301" localize="false"/>
-<paragraph id="par_id79348" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select the font for the selected text object.</ahelp></paragraph><comment>Print when group change</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PRINTWHENGROUPCHANGE" id="bm_id2129276" localize="false"/>
-<paragraph id="par_id2414014" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Print when group change</ahelp></paragraph><comment>Vert. Alignment</comment>
-<bookmark xml-lang="en-US" branch="hid/EXTENSIONS_HID_PROP_VERTICAL_ALIGN" id="bm_id9719229" localize="false"/>
-<paragraph id="par_id7617114" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Vert. Alignment</ahelp></paragraph>
-<paragraph id="par_id1593676" role="paragraph" xml-lang="en-US">On the <emph>General</emph> tab page of a data field, you can set the Formatting properties, among others.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_DATAFIELD" id="bm_id3860896" localize="false"/>
-<paragraph id="par_id1243629" role="paragraph" xml-lang="en-US"><ahelp hid=".">On the Data tab page, you can change the data contents to be shown.</ahelp></paragraph>
+  <h1 id="hd_id8836939"><variable id="rep_prop"><link href="text/shared/explorer/database/rep_prop.xhp">Properties</link></variable></h1>
+  <paragraph id="par_id2711264" role="paragraph">The Properties window of the <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link> always shows the properties of the currently selected object in the Report Builder view.</paragraph>
+  <tip id="par_id1080660">Press Shift-F1 and point with the mouse at an input box to see a help text for this input box.</tip>
+  <paragraph id="par_id7175817" role="paragraph">On first start of the Report Builder, the Properties window shows the <emph>Data</emph> tab page for the whole report.</paragraph>
+  <paragraph id="par_id9895931" role="paragraph">Select a table from the Contents list, then press Tab or click outside the input box to leave the input box.</paragraph>
+  <paragraph id="par_id3587145" role="paragraph"><ahelp hid=".">The <link href="text/shared/explorer/database/rep_insertfield.xhp" name="add_fields_link">Add fields to report</link> window is shown automatically when you have selected a table in the Contents box and leave that box. You can also click the Add Field icon on the toolbar, or choose <item type="menuitem">View - Add Field</item>.</ahelp></paragraph>
+  <paragraph id="par_id6993926" role="paragraph">The <emph>General</emph> tab page can be used to change the name of the report, and to disable the Page Header or Page Footer areas, among others.</paragraph>
+  <bookmark xml-lang="en-US" branch="hid/.uno:SelectReport" id="bm_id9044770" localize="false"/>
+  <tip id="par_id3729361"><ahelp hid=".">To display the <emph>Data</emph> or <emph>General</emph> tab page for the whole report, choose <item type="menuitem">Edit - Select All - Select Report</item>.</ahelp></tip>
+  <bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_GROUPKEEPTOGETHER" id="bm_id5392315" localize="false"/>
+  <paragraph id="par_id1768852" role="paragraph"><ahelp hid="." visibility="hidden">Groups are kept together by page or by column (default). You must enable Keep Together also.</ahelp></paragraph><comment>Page header</comment>
+  <bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PAGEHEADEROPTION" id="bm_id7852412" localize="false"/>
+  <paragraph id="par_id6304818" role="paragraph"><ahelp hid="." visibility="hidden">Specifies in which context the page header will be printed: on all pages, or not on pages with a report header or footer.</ahelp></paragraph><comment>Page footer</comment>
+  <bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PAGEFOOTEROPTION" id="bm_id9031952" localize="false"/>
+  <paragraph id="par_id401623" role="paragraph"><ahelp hid="." visibility="hidden">Specifies in which context the page footer will be printed: on all pages, or not on pages with a report header or footer</ahelp></paragraph><comment>Print repeated values</comment>
+  <bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PRINTREPEATEDVALUES" id="bm_id7956785" localize="false"/>
+  <paragraph id="par_id2162236" role="paragraph"><ahelp hid="." visibility="hidden">Specifies to print repeated values.</ahelp></paragraph>
+  <paragraph id="par_id7022003" role="paragraph">If you click the Page Header or Page Footer area without selecting any object, you see the <emph>General</emph> tab page for that area.</paragraph>
+  <paragraph id="par_id7004303" role="paragraph">You can edit some visual properties for the area.<comment>screen only or also in report?</comment></paragraph><comment>Background color</comment>
+  <bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_BACKCOLOR" id="bm_id9801324" localize="false"/>
+  <paragraph id="par_id2561723" role="paragraph"><ahelp hid="." visibility="hidden">Sets the background color for the selected object, both on screen and for printing.</ahelp></paragraph><comment>Visible</comment>
+  <bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_VISIBLE" id="bm_id7446516" localize="false"/>
+  <paragraph id="par_id1064485" role="paragraph"><ahelp hid="." visibility="hidden">An invisible object is not shown in the executed report. It is still visible in the Report Builder view.</ahelp></paragraph><comment>Height</comment>
+  <bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_HEIGHT" id="bm_id8859828" localize="false"/>
+  <paragraph id="par_id2356028" role="paragraph"><ahelp hid="." visibility="hidden">Defines the height of the selected object.</ahelp></paragraph><comment>Conditional Print Expression</comment>
+  <bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_CONDITIONALPRINTEXPRESSION" id="bm_id4359874" localize="false"/>
+  <paragraph id="par_id1404461" role="paragraph"><ahelp hid=".">If the Conditional Print Expression evaluates to TRUE, the selected object will be printed.</ahelp></paragraph><comment>id="par_id2386852" Conditions use the following form:</comment><comment>Background transparent</comment>
+  <bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_BACKTRANSPARENT" id="bm_id5689565" localize="false"/>
+  <paragraph id="par_id7404705" role="paragraph"><ahelp hid="." visibility="hidden">Specifies whether the background of the selected object is transparent or opaque.</ahelp><comment>just guessing</comment></paragraph>
+  <paragraph id="par_id7466963" role="paragraph">If you click the <emph>Detail</emph> area without selecting any object, you see the <emph>General</emph> tab page for that area.</paragraph>
+  <paragraph id="par_id3644215" role="paragraph">You can specify some properties to fine-tune the way the records are printed.</paragraph><comment>Force New Page</comment>
+  <bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_FORCENEWPAGE" id="bm_id66225" localize="false"/>
+  <paragraph id="par_id3148899" role="paragraph"><ahelp hid="." visibility="hidden">Force New Page specifies whether the current section and/or the next section is printed on a new page.</ahelp></paragraph><comment>New Row Or Column</comment>
+  <bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_NEWROWORCOL" id="bm_id3920102" localize="false"/>
+  <paragraph id="par_id6164433" role="paragraph"><ahelp hid="." visibility="hidden">New Row Or Column specifies, for a multi-column design, whether the current section and/or the next section will be printed on a new row or column.</ahelp></paragraph><comment>Keep together</comment>
+  <bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_KEEPTOGETHER" id="bm_id8053529" localize="false"/>
+  <paragraph id="par_id7405011" role="paragraph"><ahelp hid="." visibility="hidden">Keep Together specifies to print the current object starting on top of a new page if it doesn't fit on the current page.</ahelp></paragraph>
+  <paragraph id="par_id1536606" role="paragraph">Insert some data fields into the Detail area, or insert other control fields into any area. When you select an inserted field, you can set the properties in the Properties window.</paragraph>
+  <paragraph id="par_id9631641" role="paragraph">For a Label field, you can change the displayed text in the Label input box.</paragraph>
+  <bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PRESERVEIRI" id="bm_id7422711" localize="false"/>
+  <paragraph id="par_id7749565" role="paragraph"><ahelp hid=".">For a picture, you can specify to either insert the picture as a link to a file or only as an embedded object in the Base file. The embedded option increases the size of the Base file, while the link option is not as portable to other computers.</ahelp></paragraph><comment>Position x</comment>
+  <bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONX" id="bm_id6006958" localize="false"/>
+  <paragraph id="par_id4041871" role="paragraph"><ahelp hid="." visibility="hidden">Set the X Position for the selected object</ahelp><comment>x in pixel or twips? or current measurement units? from origin as on ruler? from elsewhere?</comment></paragraph><comment>Position y</comment>
+  <bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONY" id="bm_id7606128" localize="false"/>
+  <paragraph id="par_id9930722" role="paragraph"><ahelp hid="." visibility="hidden">Set the Y Position for the selected object</ahelp></paragraph><comment>Width</comment>
+  <bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_WIDTH" id="bm_id5778374" localize="false"/>
+  <paragraph id="par_id5749687" role="paragraph"><ahelp hid="." visibility="hidden">Sets the width of the selected object.</ahelp></paragraph><comment>Font</comment>
+  <bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_FONT" id="bm_id3184301" localize="false"/>
+  <paragraph id="par_id79348" role="paragraph"><ahelp hid="." visibility="hidden">Select the font for the selected text object.</ahelp></paragraph><comment>Print when group change</comment>
+  <bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PRINTWHENGROUPCHANGE" id="bm_id2129276" localize="false"/>
+  <paragraph id="par_id2414014" role="paragraph"><ahelp hid="." visibility="hidden">Print when group change</ahelp></paragraph><comment>Vert. Alignment</comment>
+  <bookmark xml-lang="en-US" branch="hid/EXTENSIONS_HID_PROP_VERTICAL_ALIGN" id="bm_id9719229" localize="false"/>
+  <paragraph id="par_id7617114" role="paragraph"><ahelp hid="." visibility="hidden">Vert. Alignment</ahelp></paragraph>
+  <paragraph id="par_id1593676" role="paragraph">On the <emph>General</emph> tab page of a data field, you can set the Formatting properties, among others.</paragraph>
+  <bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_DATAFIELD" id="bm_id3860896" localize="false"/>
+  <paragraph id="par_id1243629" role="paragraph"><ahelp hid=".">On the Data tab page, you can change the data contents to be shown.</ahelp></paragraph>
 </body>
-
 </helpdocument>
diff --git a/source/text/shared/guide/protection.xhp b/source/text/shared/guide/protection.xhp
index 991172cfe8..cb8a3f5eb9 100644
--- a/source/text/shared/guide/protection.xhp
+++ b/source/text/shared/guide/protection.xhp
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -26,7 +25,8 @@
   </topic>
 </meta>
 <body>
-  <bookmark xml-lang="en-US" branch="index" id="bm_id3150620"><bookmark_value>protecting; contents</bookmark_value>
+  <bookmark xml-lang="en-US" branch="index" id="bm_id3150620">
+    <bookmark_value>protecting; contents</bookmark_value>
     <bookmark_value>protected contents</bookmark_value>
     <bookmark_value>contents protection</bookmark_value>
     <bookmark_value>encryption of contents</bookmark_value>
@@ -61,7 +61,7 @@
             </tablecell>
          </tablerow>
       </table>
-  <tip id="par_id761632164002322">It is possible to use OpenPGP to define private and public keys to be used to encrypt %PRODUCTNAME documents. Read <embedvar href="text/shared/guide/openpgp.xhp#openpgph1"/> to learn more on how to set up OpenPGP encryption keys.</tip>
+  <tip id="par_id761632164002322">It is possible to use OpenPGP to define private and public keys to be used to encrypt %PRODUCTNAME documents. Read <link href="text/shared/guide/openpgp.xhp" name="openpgp_link">Encrypting Documents with OpenPGP</link> to learn more on how to set up OpenPGP encryption keys.</tip>
   <h2 id="hd_id3149294">Protecting Revision Marking</h2>
   <paragraph xml-lang="en-US" id="par_id3161646" role="paragraph">With every change made in <item type="productname">%PRODUCTNAME</item> Calc and <item type="productname">%PRODUCTNAME</item> Writer, the review function records who made the change. This function can be turned on with protection, so that it can only be turned off when the correct password is entered. Until then, all changes will continue to be recorded. Acceptance or rejection of changes is not possible.</paragraph>
       <table id="tbl_id3148797">
diff --git a/source/text/shared/guide/redlining_accept.xhp b/source/text/shared/guide/redlining_accept.xhp
index dbfea1cae8..d2d59ac307 100644
--- a/source/text/shared/guide/redlining_accept.xhp
+++ b/source/text/shared/guide/redlining_accept.xhp
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,21 +17,21 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
- 
-	
+
 <meta>
-<topic id="textsharedguideredlining_acceptxml" indexer="include">
-<title id="tit" xml-lang="en-US">Accepting or Rejecting Changes</title>
-<filename>/text/shared/guide/redlining_accept.xhp</filename>
-</topic>
+  <topic id="textsharedguideredlining_acceptxml" indexer="include">
+    <title id="tit" xml-lang="en-US">Accepting or Rejecting Changes</title>
+    <filename>/text/shared/guide/redlining_accept.xhp</filename>
+  </topic>
 </meta>
+
 <body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3150247"><bookmark_value>changes; accepting or rejecting</bookmark_value>
-<bookmark_value>review function;accepting or rejecting changes</bookmark_value>
-</bookmark>
-<h1 id="hd_id3150247"><variable id="redlining_accept"><link href="text/shared/guide/redlining_accept.xhp" name="Accepting or Rejecting Changes">Accepting or Rejecting Changes</link>
-</variable></h1>
-<paragraph role="paragraph" id="par_id1491134" xml-lang="en-US">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
+  <bookmark xml-lang="en-US" branch="index" id="bm_id3150247">
+    <bookmark_value>changes; accepting or rejecting</bookmark_value>
+    <bookmark_value>review function;accepting or rejecting changes</bookmark_value>
+  </bookmark>
+  <h1 id="hd_id3150247"><variable id="redlining_accept"><link href="text/shared/guide/redlining_accept.xhp" name="Accepting or Rejecting Changes">Accepting or Rejecting Changes</link></variable></h1>
+  <paragraph role="paragraph" id="par_id1491134" xml-lang="en-US">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
 <switch select="appl">
 <case select="WRITER">
 <note id="par_id1110200810120034">In Writer text documents you can also accept or reject changes by choosing commands from the context menu.</note>
@@ -41,7 +40,7 @@
 <paragraph role="paragraph" id="par_id3147571" xml-lang="en-US">When you edit a document in which others have made changes, you can accept or reject the changes individually or all together.</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3147008" xml-lang="en-US">If you have put multiple copies of the document in circulation, first merge these into one document (see <embedvar href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>).</paragraph>
+<paragraph role="listitem" id="par_id3147008" xml-lang="en-US">If you have put multiple copies of the document in circulation, first merge these into one document (see <link href="text/shared/guide/redlining_docmerge.xhp" name="redlining_docmerge_link">Merging Versions</link>).</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3153748" xml-lang="en-US">Open the document and choose <emph>Edit - Track Changes - Manage</emph>. The <emph>Manage Changes</emph> dialog appears.</paragraph>
@@ -53,14 +52,15 @@
 <paragraph role="paragraph" id="par_id3147209" xml-lang="en-US">If one author has modified another author's change, you will see the changes hierarchically arranged with a plus sign for opening up the hierarchy.</paragraph>
 <paragraph role="paragraph" id="par_id3148474" xml-lang="en-US">If the list of changes is too long, you can switch to the <emph>Filter</emph> tab in the dialog and specify that you only want to see the changes of certain authors, or only the changes of the last day, or that you want the list to be restricted in some other way.</paragraph>
 <paragraph role="paragraph" id="par_id3143271" xml-lang="en-US">Color-coded entries display the result of the filter that is set. Entries in black can be accepted or rejected and match the filter criteria. Entries in blue do not themselves match the filter criteria, but have subentries that are included by the filter. Gray entries cannot be accepted or rejected and do not match the filter criterion. Green entries do match the filter but cannot be accepted or rejected.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/redlining.xhp#redlining"/>
-<switch select="appl">
-<case select="WRITER"><embed href="text/shared/guide/redlining_navigation.xhp#redlining_navigation"/></case>
-</switch>
-<embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/>
-<embed href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>
-<embed href="text/shared/guide/redlining_versions.xhp#redlining_versions"/>
-</section>
+
+  <section id="relatedtopics">
+    <embed href="text/shared/guide/redlining.xhp#redlining"/>
+    <switch select="appl">
+      <case select="WRITER"><embed href="text/shared/guide/redlining_navigation.xhp#redlining_navigation"/></case>
+    </switch>
+    <embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/>
+    <embed href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>
+    <embed href="text/shared/guide/redlining_versions.xhp#redlining_versions"/>
+  </section>
 </body>
 </helpdocument>
author	Rafael Lima <rafael.palma.lima@gmail.com>	2021-10-19 15:52:52 +0200
committer	Olivier Hallot <olivier.hallot@libreoffice.org>	2021-10-21 20:00:22 +0200
commit	f025640e2603ee252a21e935c2790627a2e95224 (patch)
tree	aacfef8cdf2f067d7489c3dec5de04e5f2e62468
parent	993399c7c55d58bf084234713b07ac6ef8442b03 (diff)