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

[Seth Chaiklin (via logerrit)]

 source/text/swriter/01/05170000.xhp |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 8539d61c5ecca6748e4734671a86783de5fdd4b2
Author:     Seth Chaiklin <sdc.blanco at youmail.dk>
AuthorDate: Sat Nov 7 15:51:57 2020 +0200
Commit:     Seth Chaiklin <sdc.blanco at youmail.dk>
CommitDate: Wed Nov 11 09:51:19 2020 +0100

    Resolves: tdf#130719 add "note" about loading and overwriting styles
    
          - drop existing "warning" under overwrite (because
              it simply repeats what the function is doing).
          + added sentence to overwrite explanation to mention
            that no warning message is given when overwriting.
          + Replaced "warning" with "note" that explains what
              styles actually get loaded.
          + update to <h2>
    
    Change-Id: I7a2af3627fbf53974f0e6b131660c6227a22e1f6
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105361
    Reviewed-by: Seth Chaiklin <sdc.blanco at youmail.dk>
    Tested-by: Jenkins

diff --git a/source/text/swriter/01/05170000.xhp b/source/text/swriter/01/05170000.xhp
index 9bd8bfc25..61c3e0c67 100644
--- a/source/text/swriter/01/05170000.xhp
+++ b/source/text/swriter/01/05170000.xhp
@@ -39,29 +39,29 @@
   <embed href="text/swriter/00/00000405.xhp#vorlagenladen"/>
 </section>
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/loadtemplatedialog/categories" id="bm_id3154555" localize="false"/>
-<paragraph role="heading" id="hd_id3149354" xml-lang="en-US" level="2">Categories</paragraph>
+<h2 id="hd_id3149354" xml-lang="en-US">Categories</h2>
 <paragraph role="paragraph" id="par_id3154561" xml-lang="en-US"><ahelp hid="sfx/ui/loadtemplatedialog/categories">Lists the available template categories. Click a category to view its contents in the <emph>Templates </emph>list.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/loadtemplatedialog/templates" id="bm_id3145242" localize="false"/>
-<paragraph role="heading" id="hd_id3149885" xml-lang="en-US" level="2">Templates</paragraph>
+<h2 id="hd_id3149885" xml-lang="en-US">Templates</h2>
 <paragraph role="paragraph" id="par_id3145249" xml-lang="en-US"><ahelp hid="sfx/ui/loadtemplatedialog/templates">Lists the available templates for the selected category.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/loadtemplatedialog/text" id="bm_id3148772" localize="false"/>
-<paragraph role="heading" id="hd_id3148392" xml-lang="en-US" level="2">Text</paragraph>
+<h2 id="hd_id3148392" xml-lang="en-US">Text</h2>
 <paragraph role="paragraph" id="par_id3149026" xml-lang="en-US"><ahelp hid="sfx/ui/loadtemplatedialog/text">Loads the paragraph and the character styles from the selected document into the current document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/loadtemplatedialog/frame" id="bm_id3147174" localize="false"/>
-<paragraph role="heading" id="hd_id3153717" xml-lang="en-US" level="2">Frame</paragraph>
+<h2 id="hd_id3153717" xml-lang="en-US">Frame</h2>
 <paragraph role="paragraph" id="par_id3156320" xml-lang="en-US"><ahelp hid="sfx/ui/loadtemplatedialog/frame">Loads the frame styles from the selected document into the current document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/loadtemplatedialog/pages" id="bm_id3151271" localize="false"/>
-<paragraph role="heading" id="hd_id3147565" xml-lang="en-US" level="2">Pages</paragraph>
+<h2 id="hd_id3147565" xml-lang="en-US">Pages</h2>
 <paragraph role="paragraph" id="par_id3154642" xml-lang="en-US"><ahelp hid="sfx/ui/loadtemplatedialog/pages">Loads the page styles from the selected document into the current document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/loadtemplatedialog/numbering" id="bm_id3149756" localize="false"/>
-<paragraph role="heading" id="hd_id3153147" xml-lang="en-US" level="2">Numbering</paragraph>
+<h2 id="hd_id3153147" xml-lang="en-US">Numbering</h2>
 <paragraph role="paragraph" id="par_id3152587" xml-lang="en-US"><ahelp hid="sfx/ui/loadtemplatedialog/numbering">Loads the numbering styles from the selected document into the current document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/loadtemplatedialog/overwrite" id="bm_id3147507" localize="false"/>
-<paragraph role="heading" id="hd_id3151176" xml-lang="en-US" level="2">Overwrite</paragraph>
-<paragraph role="paragraph" id="par_id3147514" xml-lang="en-US"><ahelp hid="sfx/ui/loadtemplatedialog/overwrite">Replaces styles in the current document that have the same name as the styles you are loading.</ahelp></paragraph>
-<warning id="par_id3150358" xml-lang="en-US">Styles with identical names are automatically overwritten.</warning>
+<h2 id="hd_id3151176" xml-lang="en-US">Overwrite</h2>
+<paragraph role="paragraph" id="par_id3147514" xml-lang="en-US"><ahelp hid="sfx/ui/loadtemplatedialog/overwrite">Replaces styles in the current document that have the same name as the styles you are loading. No warning message is given.</ahelp></paragraph>
+<note id="par_id3150358" xml-lang="en-US">Only applied styles and modified styles are loaded from a document or template. The styles shown in the sidebar cannot be used as a guide.</note>
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/loadtemplatedialog/fromfile" id="bm_id3147520" localize="false"/>
-<paragraph role="heading" id="hd_id3153668" xml-lang="en-US" level="2">From File</paragraph>
+<h2 id="hd_id3153668" xml-lang="en-US">From File</h2>
 <paragraph role="paragraph" id="par_id3147526" xml-lang="en-US"><ahelp hid="sfx/ui/loadtemplatedialog/fromfile">Locate the file containing the styles that you want to load, and then click <emph>Open</emph>.</ahelp></paragraph>
 </body>
 </helpdocument>