tdf#34398 add links about user-defined borders

  ( shared/01/05030500.xhp )
    * move link about "User-defined Borders
      in Text Document" from top of page down
      to "Related Topics"
    + update to: <h1>,<tip>,some <h2>

  ( shared/guide/border_table.xhp )
    + add link in "related topics" to "User-defined
      Borders in Text Documents"
    + update to: <h1>,<h2>

Change-Id: I6413c2614ab3672e4f8731ff1bc37466abca1b7e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105454
Reviewed-by: Seth Chaiklin <sdc.blanco@youmail.dk>
Tested-by: Jenkins

2 files changed, 20 insertions, 29 deletions

diff --git a/source/text/shared/01/05030500.xhp b/source/text/shared/01/05030500.xhp
index 5562eae164..2b9beead8e 100644
--- a/source/text/shared/01/05030500.xhp
+++ b/source/text/shared/01/05030500.xhp
@@ -28,7 +28,7 @@
 <section id="umrandung">
 <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"/>
-<paragraph role="heading" id="hd_id3154812" xml-lang="en-US" level="1"><link href="text/shared/01/05030500.xhp" name="Borders">Borders</link></paragraph>
+<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.
@@ -37,8 +37,7 @@
   <embed href="text/shared/00/00040500.xhp#umrandung"/>
 </section>
 <switch select="appl">
-<case select="WRITER"><paragraph role="tip" id="par_id3152997" xml-lang="en-US">To modify the border of an entire table, place the cursor in a table cell, right-click, choose <emph>Table</emph>, and then click the <emph>Borders</emph> tab. To modify the border of a table cell, select the cell, right-click, choose <emph>Table</emph>, and then click the <emph>Borders</emph> tab.</paragraph>
-<embed href="text/swriter/guide/borders.xhp#borders"/>
+<case select="WRITER"><tip id="par_id3152997" xml-lang="en-US">To modify the border of an entire table, place the cursor in a table cell, right-click, choose <emph>Table</emph>, and then click the <emph>Borders</emph> tab. To modify the border of a table cell, select the cell, right-click, choose <emph>Table</emph>, and then click the <emph>Borders</emph> tab.</tip>
 </case>
 <case select="CALC"><embed href="text/scalc/guide/borders.xhp#borders"/>
 </case>
@@ -53,7 +52,7 @@
 <embed href="text/shared/00/00000007.xhp#objektleiste"/>
 <embed href="text/shared/02/03140000.xhp#sylinienstil"/>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/linecolorlb" id="bm_id3154072" localize="false"/><paragraph role="paragraph" id="par_id3154938" xml-lang="en-US"><ahelp hid="cui/ui/borderpage/linecolorlb">Select the line color that you want to use for the selected border(s).</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150359" xml-lang="en-US" level="2">Padding</paragraph>
+<h2 id="hd_id3150359" xml-lang="en-US">Padding</h2>
 <paragraph role="paragraph" id="par_id3154365" xml-lang="en-US">Specify the amount of space that you want to leave between the border and the contents of the selection.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/borderpage/leftmf" id="bm_id3154819" localize="false"/><paragraph role="heading" id="hd_id3147084" xml-lang="en-US" level="3">Left</paragraph>
 <paragraph role="paragraph" id="par_id3151176" xml-lang="en-US"><ahelp hid="cui/ui/borderpage/leftmf">Enter the distance that you want to have between the left border and the contents of the selection.</ahelp></paragraph>
@@ -93,7 +92,10 @@
 <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"/>
+<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"/>
diff --git a/source/text/shared/guide/border_table.xhp b/source/text/shared/guide/border_table.xhp
index c42bb333fa..178ea94571 100644
--- a/source/text/shared/guide/border_table.xhp
+++ b/source/text/shared/guide/border_table.xhp
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -20,8 +18,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-
-		<helpdocument version="1.0">
 <meta>
 <topic id="textsharedguideborder_tablexml" indexer="include" status="PUBLISH">
 <title xml-lang="en-US" id="tit">Defining Borders for Tables and Table Cells</title>
@@ -30,8 +26,6 @@
 </meta>
 <body>
 
-
-
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155805"><bookmark_value>tables in text; defining borders</bookmark_value>
 <bookmark_value>tables in spreadsheets;defining borders</bookmark_value>
 <bookmark_value>borders; for tables</bookmark_value>
@@ -39,9 +33,9 @@
 <bookmark_value>defining;table borders</bookmark_value>
 </bookmark>
   <comment>mw deleted "adding;"</comment>
-  <paragraph xml-lang="en-US" id="hd_id3155805" role="heading" level="1"><variable id="border_table"><link href="text/shared/guide/border_table.xhp" name="Defining Borders for Tables and Table Cells">Defining Borders for Tables and Table Cells</link>
-</variable></paragraph>
-  <paragraph xml-lang="en-US" id="hd_id3147008" role="heading" level="2">Setting a Predefined Border Style</paragraph>
+  <h1 xml-lang="en-US" id="hd_id3155805"><variable id="border_table"><link href="text/shared/guide/border_table.xhp" name="Defining Borders for Tables and Table Cells">Defining Borders for Tables and Table Cells</link>
+</variable></h1>
+  <h2 xml-lang="en-US" id="hd_id3147008">Setting a Predefined Border Style</h2>
   <list type="ordered">
    <listitem>
     <paragraph xml-lang="en-US" id="par_id3146957" role="listitem">Select the table cells that you want to modify.</paragraph>
@@ -54,7 +48,7 @@
     <paragraph xml-lang="en-US" id="par_id3156156" role="listitem">This <emph>adds</emph> the selected style to the current border style of the table cells. Select the blank border style at the top left of the <emph>Borders</emph> window to clear all border styles.</paragraph>
    </listitem>
   </list>
-  <paragraph xml-lang="en-US" id="hd_id3153666" role="heading" level="2">Setting a Customized Border Style</paragraph>
+  <h2 xml-lang="en-US" id="hd_id3153666">Setting a Customized Border Style</h2>
   <list type="ordered">
    <listitem>
     <paragraph xml-lang="en-US" id="par_id3152472" role="listitem">Select the table cells that you want to modify.</paragraph>
@@ -83,19 +77,14 @@
    </listitem>
   </list>
   <section id="relatedtopics">
-
-
-<switch select="appl">
-
-<case select="WRITER">
-   <embed href="text/swriter/guide/border_object.xhp#border_object"/>
-   <embed href="text/swriter/guide/border_page.xhp#border_page"/>
-
-</case>
-
-</switch>
-   <embed href="text/shared/guide/border_paragraph.xhp#border_paragraph"/>
-
+    <switch select="appl">
+      <case select="WRITER">
+        <embed href="text/swriter/guide/border_object.xhp#border_object"/>
+        <embed href="text/swriter/guide/border_page.xhp#border_page"/>
+        <embed href="text/swriter/guide/borders.xhp#borders"/>
+      </case>
+    </switch>
+  <embed href="text/shared/guide/border_paragraph.xhp#border_paragraph"/>
   </section>
  </body>
 </helpdocument>