From d6aef8e38dc5f623b7c1b79d817c94e546ecb86c Mon Sep 17 00:00:00 2001 From: Seth Chaiklin Date: Mon, 7 Dec 2020 10:17:28 +0100 Subject: 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

( 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

, ( swriter/guide/template_create.xhp ) * replace template_default with standard_template ( swriter/guide/template_default.xhp ) * update to

,

, ( shared/guide/standard_template.xhp ) - removed template_default from ( 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

,

, Change-Id: I3e24bdac060339ca15c3ddfb5f1bc34f5e8e77ab Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107302 Tested-by: Jenkins Reviewed-by: Seth Chaiklin Reviewed-by: Adolfo Jayme Barrientos (cherry picked from commit 452d30de3107e088c203c61e761a1319b528d789) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107379 --- source/auxiliary/swriter.tree | 3 +-- source/text/shared/guide/aaa_start.xhp | 16 ++++++++-------- source/text/shared/guide/standard_template.xhp | 5 +---- source/text/shared/guide/template_manager.xhp | 2 +- source/text/swriter/guide/main.xhp | 7 +++---- source/text/swriter/guide/pagestyles.xhp | 2 +- source/text/swriter/guide/template_create.xhp | 2 +- source/text/swriter/guide/template_default.xhp | 9 +++++---- source/text/swriter/guide/templates_styles.xhp | 4 ++-- source/text/swriter/guide/text_direct_cursor.xhp | 21 ++++++++++----------- source/text/swriter/guide/using_hyphen.xhp | 2 +- 11 files changed, 34 insertions(+), 39 deletions(-) (limited to 'source') 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 @@ Using Styles From Another Document or Template Creating New Styles From Selections Updating Styles From Selections -Creating a Document Template -Changing the Default Template +Creating and Changing Default and Custom Templates Changing Page Orientation (Landscape or Portrait) Changing the Case of Text 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 @@ - - + - - + First Steps @@ -31,16 +29,17 @@ templates; new documents from templates business cards; using templates -First Steps - -How to simplify your work using samples and templates +

First Steps

+

How to simplify your work using samples and templates

%PRODUCTNAME includes many sample documents and ready-to-use templates. You can access these by choosing File - New - Templates, or press Shift+CommandCtrl+N. When you open one of the templates, a new document is created based on this template. Click the Browse online templates button in the dialog to select and download more templates. You can also use the various wizards (under the File - Wizards menu) to create your own templates, which you can use as a basis for further documents. - +
Working with %PRODUCTNAME +Working with Templates + Working with Text Documents Working with Spreadsheets @@ -51,5 +50,6 @@ Working with Formulas +
 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 @@
Templates - - - -
+ 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 @@
See Templates and Styles for related information. -See Creating a Document Template for related information. +See Creating a Document Template for related information. See Chapter 3 – Using Styles and Templates in the Getting Started Guide, available from the documentation website. Refer to https://templates.libreoffice.org for templates to download.
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 @@ - - + -Automatically Entering and Formatting Text +

Automatically Entering and Formatting Text

@@ -77,7 +76,7 @@ -Using Styles, Numbering Pages, Using Fields +

Using Styles, Numbering Pages, Using Fields

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 @@ - + 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 @@
- + File - Templates - Save As Template
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 @@ templates; default templates text documents;default templates mw changed "text;" to "text documents;"mw changed "default templates;" -Changing the Default Template - +

Changing the Default Template +

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. - To Create a Default Template +

To Create a Default Template

Create a document and the content and formatting styles that you want. @@ -62,9 +62,10 @@ Close the dialog. - +
+
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 @@

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. Unless you specify otherwise, every new $[officename] text document is based on the default template. - $[officename] has a number of predefined templates that you can use to create different types or text documents, such as business letters. + $[officename] has a number of predefined templates that you can use to create different types of text documents, such as business letters.
- +
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 . --> - - + Using the Direct Cursor @@ -34,33 +33,33 @@ cursor;direct cursor settings;direct cursor -Using the Direct Cursor +

Using the Direct Cursor

The direct cursor allows you to enter text anywhere on a page. To set the behavior of the direct cursor, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids. On the Tools bar, click the Direct Cursor icon -Icon. +Icon. 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: -Icon +Icon Align left -Icon +Icon Centered -Icon +Icon Align right Type your text. %PRODUCTNAME automatically inserts the required number of blank lines, and, if the options are enabled, tabs and spaces. - +
- - - + +
+ \ 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 @@ - + Text Flow -- cgit