diff options
author | Seth Chaiklin <sdc.blanco@youmail.dk> | 2020-12-07 10:17:28 +0100 |
---|---|---|
committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2020-12-08 12:53:48 +0100 |
commit | d6aef8e38dc5f623b7c1b79d817c94e546ecb86c (patch) | |
tree | ef0a308c51ed059ea67545c9bbc01ff55bbcb5c3 | |
parent | 5eb5d19468c2b84d1adfef20d1723c8c7d6289f3 (diff) |
tdf#107229 replace links from template_{create,default} with standard
In https://gerrit.libreoffice.org/c/help/+/105855,
standard_template.xhp was updated to give explanations about
creating and modifying default and custom templates. This
updated page makes "template_create.xhp" and "template_default.xhp"
obsolete. This patch replaces all links to those pages
with links to "standard_template.xhp". No attempt was made
to update the content of "template_create.xhp" and
"template_default.xhp". (Also, the content of these two files are
almost identical.)
( swriter/guide/main.xhp )
* replace template_create, template_default with standard_template
* update two <h2>
( swriter/guide/templates_styles.xhp )
* replace template_default with standard_template
- remove incorrect link to predefined templates
* correct spelling mistake
( shared/guide/template_manager.xhp )
* replace template_create with standard_template
( swriter/guide/templates_styles.xhp )
* replace template_default with standard_template
( swriter/guide/using_hyphen.xhp )
* replace template_default with standard_template
( swriter/guide/text_direct_cursor.xhp )
* replace template_default with standard_template
- delete template_create
* update all icon sizes to 1cm
* update to <h1>,<relatedtopics>
( swriter/guide/template_create.xhp )
* replace template_default with standard_template
( swriter/guide/template_default.xhp )
* update to <h1>,<h2>,<relatedtopics>
( shared/guide/standard_template.xhp )
- removed template_default from <relatedtopics>
( auxiliary/swriter.tree )
* replace template_create,template_default with standard_template
( shared/guide/aaa_start.xhp )
+ add link to template_styles in "related topics"
* update to <h1>,<h2>,<relatedtopics>
Change-Id: I3e24bdac060339ca15c3ddfb5f1bc34f5e8e77ab
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107302
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin <sdc.blanco@youmail.dk>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit 452d30de3107e088c203c61e761a1319b528d789)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107379
-rw-r--r-- | source/auxiliary/swriter.tree | 3 | ||||
-rw-r--r-- | source/text/shared/guide/aaa_start.xhp | 16 | ||||
-rw-r--r-- | source/text/shared/guide/standard_template.xhp | 5 | ||||
-rw-r--r-- | source/text/shared/guide/template_manager.xhp | 2 | ||||
-rw-r--r-- | source/text/swriter/guide/main.xhp | 7 | ||||
-rw-r--r-- | source/text/swriter/guide/pagestyles.xhp | 2 | ||||
-rw-r--r-- | source/text/swriter/guide/template_create.xhp | 2 | ||||
-rw-r--r-- | source/text/swriter/guide/template_default.xhp | 9 | ||||
-rw-r--r-- | source/text/swriter/guide/templates_styles.xhp | 4 | ||||
-rw-r--r-- | source/text/swriter/guide/text_direct_cursor.xhp | 21 | ||||
-rw-r--r-- | source/text/swriter/guide/using_hyphen.xhp | 2 |
11 files changed, 34 insertions, 39 deletions
diff --git a/source/auxiliary/swriter.tree b/source/auxiliary/swriter.tree index 1902039ff2..26d2cd2381 100644 --- a/source/auxiliary/swriter.tree +++ b/source/auxiliary/swriter.tree @@ -135,8 +135,7 @@ <topic id="swriter/text/swriter/guide/load_styles.xhp">Using Styles From Another Document or Template</topic> <topic id="swriter/text/swriter/guide/stylist_fromselect.xhp">Creating New Styles From Selections</topic> <topic id="swriter/text/swriter/guide/stylist_update.xhp">Updating Styles From Selections</topic> -<topic id="swriter/text/swriter/guide/template_create.xhp">Creating a Document Template</topic> -<topic id="swriter/text/swriter/guide/template_default.xhp">Changing the Default Template</topic> +<topic id="swriter/text/swriter/guide/standard_template.xhp">Creating and Changing Default and Custom Templates</topic> </node> <topic id="swriter/text/swriter/guide/pageorientation.xhp">Changing Page Orientation (Landscape or Portrait)</topic> <topic id="swriter/text/swriter/guide/text_capital.xhp">Changing the Case of Text</topic> diff --git a/source/text/shared/guide/aaa_start.xhp b/source/text/shared/guide/aaa_start.xhp index 40a9ac22bb..eda6b989dc 100644 --- a/source/text/shared/guide/aaa_start.xhp +++ b/source/text/shared/guide/aaa_start.xhp @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<helpdocument version="1.0"> - +<helpdocument version="1.0"> <!-- * This file is part of the LibreOffice project. * @@ -18,8 +17,7 @@ * 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="textsharedguideaaa_startxml" indexer="include"> <title id="tit" xml-lang="en-US">First Steps</title> @@ -31,16 +29,17 @@ <bookmark_value>templates; new documents from templates</bookmark_value> <bookmark_value>business cards; using templates</bookmark_value> </bookmark> -<paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="1"><variable id="aaa_start"><link href="text/shared/guide/aaa_start.xhp" name="First Steps">First Steps</link> -</variable></paragraph> -<paragraph role="heading" id="hd_id3156211" xml-lang="en-US" level="3">How to simplify your work using samples and templates</paragraph> +<h1 id="hd_id3156324" xml-lang="en-US"><variable id="aaa_start"><link href="text/shared/guide/aaa_start.xhp" name="First Steps">First Steps</link></variable></h1> +<h2 id="hd_id3156211" xml-lang="en-US">How to simplify your work using samples and templates</h2> <paragraph role="paragraph" id="par_id3144436" xml-lang="en-US"> <item type="productname">%PRODUCTNAME</item> includes many sample documents and ready-to-use templates. You can access these by choosing <emph>File - New - Templates</emph>, or press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N.</paragraph> <paragraph role="paragraph" id="par_id3147291" xml-lang="en-US">When you open one of the templates, a new document is created based on this template.</paragraph> <paragraph role="paragraph" id="par_id0820200803563860" xml-lang="en-US">Click the <emph>Browse online templates</emph> button in the dialog to select and download more templates.</paragraph> <paragraph role="paragraph" id="par_id0820200803563974" xml-lang="en-US">You can also use the various wizards (under the <emph>File - Wizards</emph> menu) to create your own templates, which you can use as a basis for further documents.</paragraph> -<embed href="text/shared/00/00000004.xhp#related"/> +<section id="relatedtopics"> <paragraph role="paragraph" id="par_id3149177" xml-lang="en-US"><link href="text/shared/guide/main.xhp" name="Working with %PRODUCTNAME">Working with <item type="productname">%PRODUCTNAME</item></link></paragraph> +<paragraph role="paragraph" id="par_id401607339239056"><switchinline select="appl"><caseinline select="WRITER"><link href="text/swriter/guide/template_styles.xhp" name="Working with Templates">Working with Templates</link> +</caseinline></switchinline></paragraph> <paragraph role="paragraph" id="par_id3149095" xml-lang="en-US"><switchinline select="appl"><caseinline select="WRITER"><link href="text/swriter/guide/main.xhp" name="Working with Text Documents">Working with Text Documents</link> </caseinline></switchinline></paragraph> <paragraph role="paragraph" id="par_id3152997" xml-lang="en-US"><switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/guide/main.xhp" name="Working with Spreadsheets">Working with Spreadsheets</link> @@ -51,5 +50,6 @@ </caseinline></switchinline></paragraph> <paragraph role="paragraph" id="par_id3153824" xml-lang="en-US"><switchinline select="appl"><caseinline select="MATH"><link href="text/smath/guide/main.xhp" name="Working with Formulas">Working with Formulas</link> </caseinline></switchinline></paragraph> +</section> </body> </helpdocument> diff --git a/source/text/shared/guide/standard_template.xhp b/source/text/shared/guide/standard_template.xhp index 68f6faface..3e8e109bbf 100644 --- a/source/text/shared/guide/standard_template.xhp +++ b/source/text/shared/guide/standard_template.xhp @@ -127,9 +127,6 @@ </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> -<switch select="appl"> -<case select="WRITER"><embed href="text/swriter/guide/template_default.xhp#template_default"/> -</case> -</switch></section> +</section> </body> </helpdocument> diff --git a/source/text/shared/guide/template_manager.xhp b/source/text/shared/guide/template_manager.xhp index 19491836bc..9d6a16f9b4 100644 --- a/source/text/shared/guide/template_manager.xhp +++ b/source/text/shared/guide/template_manager.xhp @@ -189,7 +189,7 @@ <section id="relatedtopics"> <paragraph id="par_id04162017072352773" role="paragraph" xml-lang="en-US">See <link href="text/swriter/guide/templates_styles.xhp">Templates and Styles</link> for related information.</paragraph> -<paragraph id="par_id041620170723523966" role="paragraph" xml-lang="en-US">See <link href="text/swriter/guide/template_create.xhp">Creating a Document Template</link> for related information.</paragraph> +<paragraph id="par_id041620170723523966" role="paragraph" xml-lang="en-US">See <link href="text/swriter/guide/standard_template.xhp">Creating a Document Template</link> for related information.</paragraph> <paragraph id="par_id04162017072352674" role="paragraph" xml-lang="en-US">See Chapter 3 – Using Styles and Templates in the Getting Started Guide, available from the <link href="https://documentation.libreoffice.org/en/english-documentation/getting-started-guide/">documentation website</link>.</paragraph> <paragraph id="par_id041620170723529524" role="paragraph" xml-lang="en-US">Refer to <link href="https://templates.libreoffice.org">https://templates.libreoffice.org</link> for templates to download.</paragraph> </section> diff --git a/source/text/swriter/guide/main.xhp b/source/text/swriter/guide/main.xhp index 0c52ecffa0..fc73b43807 100644 --- a/source/text/swriter/guide/main.xhp +++ b/source/text/swriter/guide/main.xhp @@ -64,11 +64,10 @@ <embed href="text/swriter/guide/stylist_fillformat.xhp#stylist_fillformat"/> <embed href="text/swriter/guide/stylist_update.xhp#stylist_update"/> <embed href="text/swriter/guide/load_styles.xhp#load_styles"/> -<embed href="text/swriter/guide/template_create.xhp#template_create"/> -<embed href="text/swriter/guide/template_default.xhp#template_default"/> +<embed href="text/swriter/guide/standard_template.xhp#standard_template"/> <embed href="text/swriter/guide/registertrue.xhp#registertrue"/> <embed href="text/shared/guide/redlining.xhp#redlining"/> -<paragraph role="heading" id="hd_id3153728" xml-lang="en-US" level="2">Automatically Entering and Formatting Text</paragraph> +<h2 id="hd_id3153728" xml-lang="en-US">Automatically Entering and Formatting Text</h2> <embed href="text/swriter/guide/auto_off.xhp#auto_off"/> <embed href="text/swriter/guide/auto_numbering.xhp#auto_numbering"/> <embed href="text/swriter/guide/auto_spellcheck.xhp#auto_spellcheck"/> @@ -77,7 +76,7 @@ <embed href="text/swriter/guide/even_odd_sdw.xhp#even_odd_sdw"/> <embed href="text/shared/guide/numbering_stop.xhp#numbering_stop"/> <embed href="text/swriter/guide/removing_line_breaks.xhp#removing_line_breaks"/> -<paragraph role="heading" id="hd_id3150742" xml-lang="en-US" level="2">Using Styles, Numbering Pages, Using Fields</paragraph> +<h2 id="hd_id3150742" xml-lang="en-US">Using Styles, Numbering Pages, Using Fields</h2> <embed href="text/swriter/guide/pagenumbers.xhp#pagenumbers"/> <embed href="text/swriter/guide/pageorientation.xhp#pageorientation"/> <embed href="text/swriter/guide/pagebackground.xhp#pagebackground"/> diff --git a/source/text/swriter/guide/pagestyles.xhp b/source/text/swriter/guide/pagestyles.xhp index 0860e4024d..e8992bbcd0 100644 --- a/source/text/swriter/guide/pagestyles.xhp +++ b/source/text/swriter/guide/pagestyles.xhp @@ -110,7 +110,7 @@ <embed href="text/swriter/guide/header_with_chapter.xhp#header_with_chapter"/> <embed href="text/swriter/guide/header_footer.xhp#header_footer"/> <embed href="text/swriter/guide/header_with_line.xhp#header_with_line"/> -<embed href="text/swriter/guide/template_default.xhp#template_default"/> +<embed href="text/swriter/guide/standard_template.xhp#standard_template"/> <embed href="text/swriter/guide/pageorientation.xhp#pageorientation"/> <embed href="text/swriter/guide/pagebackground.xhp#pagebackground"/> </body> diff --git a/source/text/swriter/guide/template_create.xhp b/source/text/swriter/guide/template_create.xhp index ace0558415..177a93be76 100644 --- a/source/text/swriter/guide/template_create.xhp +++ b/source/text/swriter/guide/template_create.xhp @@ -57,7 +57,7 @@ <section id="relatedtopics"> <embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/> -<embed href="text/swriter/guide/template_default.xhp#template_default"/> +<embed href="text/swriter/guide/standard_template.xhp#standard_template"/> <embed href="text/swriter/guide/load_styles.xhp#load_styles"/> <paragraph id="par_id3149636" role="paragraph" xml-lang="en-US"><link href="text/shared/01/01110300.xhp" name="File - Templates - Save As Template">File - Templates - Save As Template</link></paragraph> </section> diff --git a/source/text/swriter/guide/template_default.xhp b/source/text/swriter/guide/template_default.xhp index 88f33318f5..7410749524 100644 --- a/source/text/swriter/guide/template_default.xhp +++ b/source/text/swriter/guide/template_default.xhp @@ -32,10 +32,10 @@ <bookmark_value>templates; default templates</bookmark_value> <bookmark_value>text documents;default templates</bookmark_value> </bookmark><comment>mw changed "text;" to "text documents;"</comment><comment>mw changed "default templates;"</comment> -<paragraph xml-lang="en-US" id="hd_id3155913" role="heading" level="1"><variable id="template_default"><link href="text/swriter/guide/template_default.xhp" name="Changing the Default Template">Changing the Default Template</link> -</variable></paragraph> +<h1 xml-lang="en-US" id="hd_id3155913"><variable id="template_default"><link href="text/swriter/guide/template_default.xhp" name="Changing the Default Template">Changing the Default Template</link> +</variable></h1> <paragraph xml-lang="en-US" id="par_id3145569" role="paragraph">The default template contains the default formatting information for new text documents. If you want, you can create a new template and use it as the default template.</paragraph> - <paragraph xml-lang="en-US" id="hd_id6414990" role="heading" level="2">To Create a Default Template</paragraph> + <h2 xml-lang="en-US" id="hd_id6414990">To Create a Default Template</h2> <list type="ordered"> <listitem> <paragraph xml-lang="en-US" id="par_id3149838" role="listitem">Create a document and the content and formatting styles that you want.</paragraph> @@ -62,9 +62,10 @@ <paragraph xml-lang="en-US" id="par_id3149620" role="listitem">Close the dialog.</paragraph> </listitem> </list> - <embed href="text/shared/00/00000004.xhp#related"/> + <section id="relatedtopics"> <embed href="text/swriter/guide/template_create.xhp#template_create"/> <embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/> <embed href="text/shared/guide/standard_template.xhp#standard_template"/> + </section> </body> </helpdocument> diff --git a/source/text/swriter/guide/templates_styles.xhp b/source/text/swriter/guide/templates_styles.xhp index d8ffe6c6fb..0606faa158 100644 --- a/source/text/swriter/guide/templates_styles.xhp +++ b/source/text/swriter/guide/templates_styles.xhp @@ -34,13 +34,13 @@ </variable></h1> <paragraph xml-lang="en-US" id="par_id3149635" role="paragraph">A template is a document that contains specific formatting styles, graphics, tables, objects, and other information. A template is used as the basis for creating other documents. For example, you can define paragraph and character styles in a document, save the document as a template, and then use the template to create a new document with the same styles.</paragraph> <paragraph xml-lang="en-US" id="par_id3149957" role="paragraph">Unless you specify otherwise, every new $[officename] text document is based on the default template.</paragraph> - <paragraph xml-lang="en-US" id="par_id3149974" role="paragraph">$[officename] has a number of <link href="text/swriter/01/05130000.xhp" name="predefined templates">predefined templates</link> that you can use to create different types or text documents, such as business letters.</paragraph> + <paragraph xml-lang="en-US" id="par_id3149974" role="paragraph">$[officename] has a number of predefined templates that you can use to create different types of text documents, such as business letters.</paragraph> <section id="relatedtopics"> <embed href="text/swriter/guide/load_styles.xhp#load_styles"/> <embed href="text/swriter/guide/change_header.xhp#change_header"/> <embed href="text/swriter/guide/stylist_fillformat.xhp#stylist_fillformat"/> <embed href="text/swriter/guide/stylist_fromselect.xhp#stylist_fromselect"/> - <embed href="text/swriter/guide/template_default.xhp#template_default"/> + <embed href="text/swriter/guide/standard_template.xhp#standard_template"/> </section> </body> </helpdocument> diff --git a/source/text/swriter/guide/text_direct_cursor.xhp b/source/text/swriter/guide/text_direct_cursor.xhp index 8b8db3032f..a24925d410 100644 --- a/source/text/swriter/guide/text_direct_cursor.xhp +++ b/source/text/swriter/guide/text_direct_cursor.xhp @@ -18,8 +18,7 @@ * 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="textswriterguidetext_direct_cursorxml" indexer="include" status="PUBLISH"> <title xml-lang="en-US" id="tit">Using the Direct Cursor</title> @@ -34,33 +33,33 @@ <bookmark_value>cursor;direct cursor</bookmark_value> <bookmark_value>settings;direct cursor</bookmark_value> </bookmark> -<paragraph xml-lang="en-US" id="hd_id3155178" role="heading" level="1"><variable id="text_direct_cursor"><link href="text/swriter/guide/text_direct_cursor.xhp" name="Using the Direct Cursor">Using the Direct Cursor</link></variable></paragraph> +<h1 xml-lang="en-US" id="hd_id3155178"><variable id="text_direct_cursor"><link href="text/swriter/guide/text_direct_cursor.xhp" name="Using the Direct Cursor">Using the Direct Cursor</link></variable></h1> <paragraph xml-lang="en-US" id="par_id3155908" role="paragraph">The direct cursor allows you to enter text anywhere on a page.</paragraph> <paragraph xml-lang="en-US" id="par_id3155921" role="paragraph">To set the behavior of the direct cursor, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - Formatting Aids</emph>.</paragraph> <list type="ordered"> <listitem> <paragraph xml-lang="en-US" id="par_idN106A3" role="listitem">On the <item type="menuitem">Tools</item> bar, click the <item type="menuitem">Direct Cursor</item> icon -<image id="img_id3149846" src="cmd/sc_shadowcursor.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3149846">Icon</alt></image>.</paragraph> +<image id="img_id3149846" src="cmd/sc_shadowcursor.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3149846">Icon</alt></image>.</paragraph> </listitem> <listitem> <paragraph xml-lang="en-US" id="par_idN106C5" role="listitem">Click in a free space in the text document. The mouse pointer changes to reflect the alignment that will be applied to the text that you type:</paragraph> <paragraph xml-lang="en-US" id="par_idN106C8" role="listitem"> -<image id="img_id5471987" src="media/helpimg/dircursleft.png" width="0.1457in" height="0.3228in"><alt xml-lang="en-US" id="alt_id5471987">Icon</alt> +<image id="img_id5471987" src="media/helpimg/dircursleft.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id5471987">Icon</alt> </image> Align left</paragraph> <paragraph xml-lang="en-US" id="par_idN106E4" role="listitem"> -<image id="img_id5730253" src="media/helpimg/dircurscent.png" width="0.2398in" height="0.3228in"><alt xml-lang="en-US" id="alt_id5730253">Icon</alt> +<image id="img_id5730253" src="media/helpimg/dircurscent.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id5730253">Icon</alt> </image> Centered</paragraph> <paragraph xml-lang="en-US" id="par_idN10700" role="listitem"> -<image id="img_id6953622" src="media/helpimg/dircursright.png" width="0.1563in" height="0.3228in"><alt xml-lang="en-US" id="alt_id6953622">Icon</alt> +<image id="img_id6953622" src="media/helpimg/dircursright.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id6953622">Icon</alt> </image> Align right</paragraph> </listitem> <listitem> <paragraph xml-lang="en-US" id="par_idN1071D" role="listitem">Type your text. %PRODUCTNAME automatically inserts the required number of blank lines, and, if the options are enabled, tabs and spaces.</paragraph> </listitem> </list> - <embed href="text/shared/00/00000004.xhp#related"/> + <section id="relatedtopics"> <embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/> - <embed href="text/swriter/guide/template_create.xhp#template_create"/> - <embed href="text/swriter/guide/template_default.xhp#template_default"/> - </body> + <embed href="text/swriter/guide/standard_template.xhp#standard_template"/> + </section> + </body> </helpdocument>
\ No newline at end of file diff --git a/source/text/swriter/guide/using_hyphen.xhp b/source/text/swriter/guide/using_hyphen.xhp index 645b72d117..0f035e63c9 100644 --- a/source/text/swriter/guide/using_hyphen.xhp +++ b/source/text/swriter/guide/using_hyphen.xhp @@ -93,7 +93,7 @@ <embed href="text/shared/00/00000004.xhp#related"/> <embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/> <embed href="text/swriter/guide/using_thesaurus.xhp#using_thesaurus"/> - <embed href="text/swriter/guide/template_default.xhp#template_default"/> + <embed href="text/swriter/guide/standard_template.xhp#standard_template"/> <embed href="text/swriter/guide/hyphen_prevent.xhp#hyphen_prevent"/> <paragraph xml-lang="en-US" id="par_id3154361" role="paragraph"><link href="text/swriter/01/05030200.xhp" name="Text Flow">Text Flow</link></paragraph> </body> |