[Libreoffice-commits] help.git: Branch 'libreoffice-7-1' - source/text

Tue Dec 15 02:59:50 UTC 2020

source/text/shared/01/01110000.xhp             |   10 +++++++++-
 source/text/shared/guide/standard_template.xhp |    4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 83a954cd538bf5b56292067c3897971f685afb04
Author:     Seth Chaiklin <sdc.blanco at youmail.dk>
AuthorDate: Sun Dec 13 18:11:17 2020 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Tue Dec 15 03:59:30 2020 +0100

    tdf#107229  add links to related topics for template help pages
    
      ( shared/guide/standard_template.xhp )
         + add missing .xhp to templatemanager link
    
      ( shared/01/01110000.xhp )  (submenu for File > Templates )
         + add <relatedtopics> section
         + add appl switch in related topics section for Writer to
            embed link to "Templates and Styles"
         + embed link to "Creating and Modifying Templates"
            (standard_template)
         * update to <h1>
    
    Change-Id: Ia419b5eb5ac0e4ab4c748cf0afc7fbb378d4d98e
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107623
    Reviewed-by: Seth Chaiklin <sdc.blanco at youmail.dk>
    Tested-by: Jenkins
    (cherry picked from commit e784d298ec11c408d1dcdb8493541033cf271922)
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107698
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/source/text/shared/01/01110000.xhp b/source/text/shared/01/01110000.xhp
index 4d278f079..a64aa4422 100644
--- a/source/text/shared/01/01110000.xhp
+++ b/source/text/shared/01/01110000.xhp
@@ -30,7 +30,7 @@
 <body>
 <section id="templates">
 <bookmark branch="hid/.uno:TemplateMenu" id="bm_id7471541" xml-lang="en-US" localize="false"/>
-<paragraph role="heading" level="1" id="hd_id3155577" xml-lang="en-US"><link href="text/shared/01/01110000.xhp" name="Templates">Templates</link></paragraph>
+<h1 id="hd_id3155577" xml-lang="en-US"><link href="text/shared/01/01110000.xhp" name="Templates">Templates</link></h1>
   <paragraph role="paragraph" id="par_id3154894" xml-lang="en-US"><ahelp hid=".">Lets you organize and edit your templates, as well as save the current file as a template.</ahelp></paragraph>
 </section>
 <section id="howtoget">
@@ -39,5 +39,13 @@
 <embed href="text/shared/01/01110300.xhp#saveastemplate"/>
 <embed href="text/shared/01/01110400.xhp#opentemplate"/>
 <embed href="text/shared/guide/template_manager.xhp#template_manager"/>
+<section id="relatedtopics">
+<switch select="appl">
+<case select="WRITER">
+<embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
+</case>
+</switch>
+<embed href="text/shared/guide/standard_template.xhp#standard_template"/>
+</section>
 </body>
 </helpdocument>
diff --git a/source/text/shared/guide/standard_template.xhp b/source/text/shared/guide/standard_template.xhp
index 3e8e109bb..a81e1e8d8 100644
--- a/source/text/shared/guide/standard_template.xhp
+++ b/source/text/shared/guide/standard_template.xhp
@@ -41,7 +41,7 @@
 </variable></h1>
 <section id="text">
 <paragraph role="paragraph" id="par_id3152811" xml-lang="en-US">When you open a new document with <emph>File - New</emph>, a blank document appears based on a $[officename] template. You can edit, modify, or replace this template so that the new document contains your customized Styles or other contents.</paragraph>
-<note id="par_id3159152" xml-lang="en-US">You can define document templates for each $[officename] module.</note>
+<note id="par_id3159152" xml-lang="en-US">You can define document templates for each $[officename] application.</note>
 <h2 id="hd_id3150792" xml-lang="en-US">Creating a Default Template</h2>
 <list type="ordered">
 <listitem>
@@ -123,7 +123,7 @@
 <h2 id="hd_id3149109" xml-lang="en-US">Saving a Template in the Template Folder</h2>
 <paragraph role="paragraph" id="par_id3146918" xml-lang="en-US">You can save any document as a template by selecting "Template" file type in the Save dialog. To access the template from the Template Manager, save the template in the <emph>User Paths</emph> directory specified for <emph>Templates</emph> in <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><emph> - %PRODUCTNAME - Paths</emph>. It is often easier to save a document with <menuitem>File - Templates - Save As Template</menuitem>, because it automatically places the template in the appropriate directory.</paragraph>
 
-<tip id="par_id271605485719890">The <link href="text/shared/guide/template_manager" name="templatemanager">Template Manager</link> is the preferred method for working with templates. <menuitem>File - New - Templates</menuitem> and  <menuitem>File - Templates - Manage Templates</menuitem> are equivalent for opening the <emph>Template Manager</emph>. <keycode>Ctrl+Shift+N</keycode> is the predefined shortcut key.</tip>
+<tip id="par_id271605485719890">The <link href="text/shared/guide/template_manager.xhp" name="templatemanager">Template Manager</link> is the preferred method for working with templates. <menuitem>File - New - Templates</menuitem> and  <menuitem>File - Templates - Manage Templates</menuitem> are equivalent for opening the <emph>Template Manager</emph>. <keycode>Ctrl+Shift+N</keycode> is the predefined shortcut key.</tip>
 </section>
 <section id="relatedtopics">
 <paragraph role="paragraph" id="par_id3147315" xml-lang="en-US"><link href="text/shared/01/01110000.xhp" name="Templates">Templates</link></paragraph>
