[Libreoffice-commits] help.git: source/text

Seth Chaiklin (via logerrit) logerrit at kemper.freedesktop.org
Fri Jan 15 13:27:07 UTC 2021


 source/text/shared/02/13020000.xhp  |   15 ++++++++++++---
 source/text/swriter/guide/ruler.xhp |   20 +++++++++++---------
 2 files changed, 23 insertions(+), 12 deletions(-)

New commits:
commit fc682e9a8b7d6d6438668fb61304460f35002b3d
Author:     Seth Chaiklin <sdc.blanco at youmail.dk>
AuthorDate: Fri Jan 15 12:24:33 2021 +0100
Commit:     Seth Chaiklin <sdc.blanco at youmail.dk>
CommitDate: Fri Jan 15 14:26:46 2021 +0100

    tdf#119657  add related topics links to help about rulers and margins
    
       ( shared/02/13020000.xhp ) (Setting Indents, Margins, and Columns)
        + add <variable> to <h1>
        + add appl-switch and <relatedtopics> section
        + add link in related topics to "Using Rulers"
          For now, this is the only link, and only applies for Writer
          and Draw, so <relatedtopics> and link are only shown for those
          two applications
        * update to <tip>,<note>,<keycode>
    
       ( swriter/guide/ruler.xhp )  (Using Rulers)
        * change order of instructions about changing indents
        + add example to illustrate how to make an indent
        + add link to "Setting Indents, Margins, and Columns" in 'related topics'
    
    Change-Id: Ie8735e3b81667601602f3bdc134433c7d3a874a6
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109341
    Reviewed-by: Seth Chaiklin <sdc.blanco at youmail.dk>
    Tested-by: Jenkins

diff --git a/source/text/shared/02/13020000.xhp b/source/text/shared/02/13020000.xhp
index db865d5b1..cf682bf86 100644
--- a/source/text/shared/02/13020000.xhp
+++ b/source/text/shared/02/13020000.xhp
@@ -41,7 +41,7 @@
 </bookmark>
 </case>
 </switch>
-<h1 id="hd_id3148668" xml-lang="en-US"><link href="text/shared/02/13020000.xhp" name="Setting Indents, Margins, and Columns">Setting Indents, Margins, and Columns</link></h1>
+<h1 id="hd_id3148668" xml-lang="en-US"><variable id="setting_margins"><link href="text/shared/02/13020000.xhp" name="Setting Indents, Margins, and Columns">Setting Indents, Margins, and Columns</link></variable></h1>
 <paragraph role="paragraph" id="par_id3155364" xml-lang="en-US">You can define the indents and margins for the current paragraph, or for all selected paragraphs, using the mouse.</paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3152594" xml-lang="en-US">If you split the page into columns, or the cursor is placed in a multiple-column frame, you can change the column width and the column spacing by dragging them on the ruler with the mouse.</paragraph>
@@ -99,7 +99,16 @@
     </tablecell>
   </tablerow>
 </table>
-<paragraph role="tip" id="par_id3154760" xml-lang="en-US">In order to change the left indent starting with the second line of a paragraph, hold down the <switchinline select="sys"><caseinline select="MAC"><emph>Command</emph></caseinline><defaultinline><emph>Ctrl</emph></defaultinline></switchinline> key, click the triangle on the bottom left, and drag it to the right.</paragraph>
-<paragraph role="note" id="par_id3148453" xml-lang="en-US">Tabs that have been set are not changed when indenting a paragraph. If the set tabs end up outside the margins of the paragraph, they are no longer displayed, but they still exist.</paragraph>
+<tip id="par_id3154760" xml-lang="en-US">In order to change the left indent starting with the second line of a paragraph, hold down the <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> key, click the triangle on the bottom left, and drag it to the right.</tip>
+<note id="par_id3148453" xml-lang="en-US">Tabs that have been set are not changed when indenting a paragraph. If the set tabs end up outside the margins of the paragraph, they are no longer displayed, but they still exist.</note>
+<switch select="appl">
+<case select="CALC"></case>
+<case select="IMPRESS"></case>                     
+<default>
+<section id="relatedtopics">
+<embed href="text/swriter/guide/ruler.xhp#ruler"/> 
+</section>
+</default>
+</switch>
 </body>
 </helpdocument>
diff --git a/source/text/swriter/guide/ruler.xhp b/source/text/swriter/guide/ruler.xhp
index 4e8f724c1..643b7276c 100644
--- a/source/text/swriter/guide/ruler.xhp
+++ b/source/text/swriter/guide/ruler.xhp
@@ -43,18 +43,20 @@
       <h2 xml-lang="en-US" id="hd_id3149038">Changing Indents</h2>
       <paragraph xml-lang="en-US" id="par_id3153631" role="paragraph">Indents are adjusted with the three small triangles on the horizontal ruler.</paragraph>
       <list type="ordered">
-         <listitem>
-            <paragraph xml-lang="en-US" id="par_id3152776" role="listitem">To change the left or the right paragraph indent, select the paragraph(s) that you want change the indent for, drag the bottom left or the bottom right triangle on the horizontal ruler to a new location. </paragraph>
-         </listitem>
-         <listitem>
-            <paragraph xml-lang="en-US" id="par_id3145769" role="listitem">To change the first line indent of a selected paragraph, drag the top left triangle on the horizontal ruler to a new location.</paragraph>
-         </listitem>
+        <listitem>
+           <paragraph xml-lang="en-US" id="par_id3145769" role="listitem">To change the first line indent of a selected paragraph, drag the top left triangle on the horizontal ruler to a new location.</paragraph>
+        </listitem>
+        <listitem>
+            <paragraph xml-lang="en-US" id="par_id3152776" role="listitem">To change the left or the right paragraph indent, select the paragraph(s) that you want change the indent for, drag the bottom left or the bottom right triangle on the horizontal ruler to a new location.</paragraph>
+        </listitem>
       </list>
+      <paragraph role="paragraph" id="par_id91610715353328">For example, to change the left indent starting with the second line of a paragraph, hold down the <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> key, click the triangle on the bottom left, and drag it to the right</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149164" role="paragraph">You can also double-click anywhere on the horizontal ruler, and adjust the indents in the <link href="text/shared/01/05030000.xhp" name="Paragraph"><emph>Paragraph</emph></link> dialog.</paragraph>
       <section id="relatedtopics">
-         <embed href="text/swriter/guide/table_sizing.xhp#table_sizing"/>
-         <embed href="text/shared/guide/tabs.xhp#tabs"/>
-         <embed href="text/shared/guide/measurement_units.xhp#measurement_units"/>
+        <embed href="text/swriter/guide/table_sizing.xhp#table_sizing"/>
+        <embed href="text/shared/guide/tabs.xhp#tabs"/>
+        <embed href="text/shared/guide/measurement_units.xhp#measurement_units"/>
+        <embed href="text/shared/02/13020000.xhp#setting_margins"/>
       </section>
    </body>
 </helpdocument>
\ No newline at end of file


More information about the Libreoffice-commits mailing list