source/text/swriter/01/04090000.xhp |   16 ++++-------
 source/text/swriter/01/04090001.xhp |   50 +++++-------------------------------
 2 files changed, 14 insertions(+), 52 deletions(-)

New commits:
commit f551d6b2ddcb319c162c7789ae65de4274b8d5d1
Author:     Seth Chaiklin <sdc.bla...@youmail.dk>
AuthorDate: Sun Oct 25 01:46:36 2020 +0200
Commit:     Seth Chaiklin <sdc.bla...@youmail.dk>
CommitDate: Mon Oct 26 21:08:01 2020 +0100

    tdf#131206 improve explanation of Insert Document (Field) (wip)
    
      - moved <note> about HTML export of date and time down to Format
          section
      - add initials for Author Type, and a sys-dependent advice about
          how to update that field.
      - remove table about Select items for Page Type, because it is
          mentioned already in Table, plus it is part of auswahl section,
          which is embedded into DocInformation (04090004.xhp), which does
          not insert any "pages" in that dialog tab.
      - add "select list" to the tip about double-clicking
      - update <literal>,<menuitem>
      - update to: <h1>,<h2> in main page for Fields
      - eliminate German id: dokument-->document in 040900001.xhp
    
    Change-Id: I72803af2a9f38d8fd1e5ef45b3751934888d8a88
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104687
    Tested-by: Jenkins
    Reviewed-by: Seth Chaiklin <sdc.bla...@youmail.dk>

diff --git a/source/text/swriter/01/04090000.xhp 
b/source/text/swriter/01/04090000.xhp
index 4a619f994..fc0ba1c15 100644
--- a/source/text/swriter/01/04090000.xhp
+++ b/source/text/swriter/01/04090000.xhp
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -20,8 +18,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-
-               <helpdocument version="1.0">
 <meta>
 <topic id="textswriter0104090000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Fields</title>
@@ -31,20 +27,20 @@
 <body>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertField" id="bm_id3076263" 
localize="false"/>
 <bookmark xml-lang="en-US" 
branch="hid/modules/swriter/ui/fielddialog/FieldDialog" id="bm_id3145412" 
localize="false"/>
-<paragraph role="heading" id="hd_id3151171" xml-lang="en-US" level="1"><link 
href="text/swriter/01/04090000.xhp" name="Fields">Fields</link></paragraph>
-<paragraph role="paragraph" id="par_id3149805" xml-lang="en-US"><variable 
id="feldbefehltext"><ahelp hid=".uno:InsertField">Inserts a field at the 
current cursor position.</ahelp> The dialog lists all available fields. 
-</variable></paragraph>
+<h1 id="hd_id3151171" xml-lang="en-US"><link 
href="text/swriter/01/04090000.xhp" name="Fields">Fields</link></h1>
+<paragraph role="paragraph" id="par_id3149805" xml-lang="en-US"><variable 
id="feldbefehltext"><ahelp hid=".uno:InsertField">Inserts a field at the 
current cursor position.</ahelp> The dialog lists all available 
fields.</variable></paragraph>
 <section id="howtoget">
   <embed href="text/swriter/00/00000404.xhp#feldbefehlein"/>
 </section>
 <embed href="text/swriter/guide/fields.xhp#fields"/>
-<embed href="text/swriter/01/04090001.xhp#dokument"/>
+<embed href="text/swriter/01/04090001.xhp#document"/>
 <embed href="text/swriter/01/04090002.xhp#referenzen"/>
 <embed href="text/swriter/01/04090003.xhp#funktionen"/>
 <embed href="text/swriter/01/04090004.xhp#dokumentinfo"/>
 <embed href="text/swriter/01/04090005.xhp#variables"/>
 <embed href="text/swriter/01/04090006.xhp#datenbank"/>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fielddialog/ok" 
id="bm_id3149692" localize="false"/><paragraph role="heading" id="hd_id3155903" 
xml-lang="en-US" level="2">Insert</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fielddialog/ok" 
id="bm_id3149692" localize="false"/>
+<h2 id="hd_id3155903" xml-lang="en-US">Insert</h2>
 <paragraph role="paragraph" id="par_id3154190" xml-lang="en-US"><ahelp 
hid="HID_FIELD_INSERT">Inserts the selected field at the current cursor 
position in the document. To close the dialog, click the <emph>Close 
</emph>button.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fielddialog/cancel" 
id="bm_id3155186" localize="false"/><paragraph role="paragraph" 
id="par_id5591296" xml-lang="en-US"><ahelp hid="." visibility="hidden">Closes 
the dialog.</ahelp></paragraph>
 </body>
diff --git a/source/text/swriter/01/04090001.xhp 
b/source/text/swriter/01/04090001.xhp
index c24739be3..4a83021f3 100644
--- a/source/text/swriter/01/04090001.xhp
+++ b/source/text/swriter/01/04090001.xhp
@@ -27,7 +27,7 @@
 
 <body>
 
-<section id="dokument">
+<section id="document">
 <bookmark xml-lang="en-US" 
branch="hid/modules/swriter/ui/flddocumentpage/@@nowidget@@" 
id="bm_@@nowidget@@" localize="false"/>
 <bookmark xml-lang="en-US" 
branch="hid/modules/swriter/ui/flddocumentpage/FldDocumentPage" 
id="bm_id3145246" localize="false"/>
 
@@ -38,7 +38,7 @@
 <section id="howtoget">
 <embed href="text/swriter/00/00000404.xhp#felddokument"/>
 </section>
-<note id="par_id3154470" xml-lang="en-US">For the HTML export and import of 
date and time fields, <link href="text/swriter/01/04090007.xhp#datumuhrzeit" 
name="special $[officename] formats">special $[officename] formats</link> are 
used.</note>
+
 
 <section id="feldtyp">
 <bookmark xml-lang="en-US" 
branch="hid/modules/swriter/ui/flddocumentpage/type" id="bm_id3153666" 
localize="false"/>
@@ -61,7 +61,8 @@
       <paragraph id="par_id3151248" role="tablecontent" 
xml-lang="en-US">Author</paragraph>
     </tablecell>
     <tablecell>
-      <paragraph id="par_id3148975" role="tablecontent" 
xml-lang="en-US">Inserts the name of the current user. </paragraph>
+      <paragraph id="par_id3148975" role="tablecontent" xml-lang="en-US">Name 
or initials of current user (as entered in <switchinline 
select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem>
+</caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - </menuitem><link 
href="text/shared/optionen/01010100.xhp" name="$[officename] - User 
Data"><menuitem>$[officename] - User Data)</menuitem></link>.</paragraph>
     </tablecell>
   </tablerow>
   <tablerow>
@@ -77,7 +78,7 @@
       <paragraph id="par_id3145771" role="tablecontent" 
xml-lang="en-US">Date</paragraph>
     </tablecell>
     <tablecell>
-      <paragraph id="par_id3151370" role="tablecontent" 
xml-lang="en-US">Inserts the current date. You can insert the date as a fixed 
field - <item type="literal">Date (fixed)</item> - that does not change, or as 
a dynamic field - <item type="literal">Date</item> - that it is updated 
automatically. To manually update the <item type="literal">Date</item> field, 
press <keycode>F9</keycode>.</paragraph>
+      <paragraph id="par_id3151370" role="tablecontent" 
xml-lang="en-US">Inserts the current date. You can insert the date as a fixed 
field - <item type="literal">Date (fixed)</item> - that does not change, or as 
a dynamic field - <literal>Date</literal> - that it is updated automatically. 
To manually update the <literal>Date</literal> field, press 
<keycode>F9</keycode>.</paragraph>
     </tablecell>
   </tablerow>
   <tablerow>
@@ -140,7 +141,6 @@
   </tablerow>
 </table>
 
-
 <section id="hinweis">
 <note id="par_id3154631" xml-lang="en-US">The following fields can only be 
inserted if the corresponding field type is selected in the <emph>Type 
</emph>list.</note>
 </section>
@@ -150,42 +150,7 @@
 
 <h2 id="hd_id3150660" xml-lang="en-US">Select<comment>on "Document" and 
"DocInformation" tab page this is called "Select", on the other tab pages 
"Selection"</comment></h2>
 <paragraph id="par_id3150678" role="paragraph" xml-lang="en-US"><ahelp 
hid="modules/swriter/ui/flddocumentpage/select">Lists the available fields for 
the field type selected in the <emph>Type </emph>list. To insert a field, click 
the field, and then click <emph>Insert</emph>.</ahelp></paragraph>
-<tip id="par_id3155537" xml-lang="en-US">To quickly insert a field from the 
list, double-click the field.</tip>
-
-<table id="tbl_id3148722">
-  <tablerow>
-    <tablecell>
-      <paragraph id="par_id3155359" role="tablehead" 
xml-lang="en-US">Fields</paragraph>
-    </tablecell>
-    <tablecell>
-      <paragraph id="par_id3154220" role="tablehead" 
xml-lang="en-US">Function</paragraph>
-    </tablecell>
-  </tablerow>
-  <tablerow>
-    <tablecell>
-      <paragraph id="par_id3156032" role="tablecontent" xml-lang="en-US">Page 
Number</paragraph>
-    </tablecell>
-    <tablecell>
-      <paragraph id="par_id3159212" role="tablecontent" 
xml-lang="en-US">Inserts the current page number.</paragraph>
-    </tablecell>
-  </tablerow>
-  <tablerow>
-    <tablecell>
-      <paragraph id="par_id3145107" role="tablecontent" 
xml-lang="en-US">Previous page</paragraph>
-    </tablecell>
-    <tablecell>
-      <paragraph id="par_id3149595" role="tablecontent" 
xml-lang="en-US">Inserts the page number of the previous page in the 
document.</paragraph>
-    </tablecell>
-  </tablerow>
-  <tablerow>
-    <tablecell>
-      <paragraph id="par_id3146896" role="tablecontent" xml-lang="en-US">Next 
page </paragraph>
-    </tablecell>
-    <tablecell>
-      <paragraph id="par_id3148923" role="tablecontent" 
xml-lang="en-US">Inserts the page number of the next page in the 
document.</paragraph>
-    </tablecell>
-  </tablerow>
-</table>
+<tip id="par_id3155537" xml-lang="en-US">To quickly insert a field from the 
<emph>Select</emph> list, double-click the field.</tip>
 
 <paragraph id="par_id3159229" role="paragraph" xml-lang="en-US">In the 
<emph>Format</emph>, click the numbering format that you want to 
use.</paragraph>
 <paragraph id="par_id3145188" role="paragraph" xml-lang="en-US">If you want, 
you can enter an <emph>Offset </emph>for the displayed page number. With an 
<emph>Offset</emph> value of 1, the field will display a number that is 1 more 
than the current page number, but only if a page with that number exists. On 
the last page of the document, this same field will be empty.</paragraph>
@@ -198,7 +163,7 @@
 <paragraph id="par_id3145613" role="paragraph" xml-lang="en-US"><ahelp 
hid="modules/swriter/ui/flddocumentpage/format">Click the format that you want 
to apply to the selected field, or click "Additional formats" to define a 
custom format.</ahelp></paragraph>
 </section>
 <paragraph id="par_id3150138" role="paragraph" xml-lang="en-US"><variable 
id="datumuhrzeitformat">When you click "Additional formats", the <link 
href="text/shared/01/05020300.xhp" name="Number Format"><emph>Number 
Format</emph></link> dialog opens, where you can define a custom format. 
</variable></paragraph>
-<paragraph id="par_id3154867" role="paragraph" xml-lang="en-US">If you choose 
"Chapter number without separator" for a chapter field, the separators that are 
specified for chapter number in <link href="text/swriter/01/06060000.xhp" 
name="Tools - Chapter numbering"><emph>Tools - Chapter numbering</emph></link> 
are not displayed.</paragraph>
+<paragraph id="par_id3154867" role="paragraph" xml-lang="en-US">If you choose 
"Chapter number without separator" for a chapter field, the separators that are 
specified for chapter number in <link href="text/swriter/01/06060000.xhp" 
name="Tools - Chapter numbering"><menuitem>Tools - Chapter 
numbering</menuitem></link> are not displayed.</paragraph>
 <paragraph id="par_id3156079" role="paragraph" xml-lang="en-US">If you choose 
"chapter number" as the <emph>format</emph> for reference fields, only the 
number of the chapter heading containing the referenced object is displayed in 
the field. If the paragraph style for the chapter heading is not numbered, the 
field is left blank.</paragraph>
 <paragraph id="par_id3148682" role="paragraph" xml-lang="en-US">The following 
number range formats are for paragraphs formatted with numbered or bulleted 
lists:</paragraph>
 
@@ -231,6 +196,7 @@
 
 <bookmark xml-lang="en-US" 
branch="hid/modules/swriter/ui/flddocumentpage/fixed" id="bm_id3153014" 
localize="false"/>
 <paragraph id="par_id0902200804313432" role="paragraph" 
xml-lang="en-US"><ahelp hid="." visibility="hidden">Inserts the field as static 
content, that is, the field cannot be updated.</ahelp></paragraph>
+<note id="par_id3154470" xml-lang="en-US">For the HTML export and import of 
date and time fields, <link href="text/swriter/01/04090007.xhp#datumuhrzeit" 
name="special $[officename] formats">special $[officename] formats</link> are 
used.</note>
 <embed href="text/swriter/01/04090004.xhp#inhaltfix"/>
 <bookmark xml-lang="en-US" 
branch="hid/modules/swriter/ui/flddocumentpage/level" id="bm_id3153038" 
localize="false"/>
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to