source/text/swriter/01/04090005.xhp | 30 ++++++++++++++----------------
source/text/swriter/01/04090100.xhp | 2 +-
2 files changed, 15 insertions(+), 17 deletions(-)
New commits:
commit f0321cbc4c5f8611b6d75b1312c9d198c1fad4cf
Author: Seth Chaiklin <sdc.bla...@youmail.dk>
AuthorDate: Fri Jan 3 12:50:24 2020 +0100
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Sun Jan 5 03:40:17 2020 +0100
updating help for Writer variables
- remove duplication
- aligned capitalization in help with capitalization in dialog box
- corrected labels to match dialog box
- move embedded parts to correct place in structure
Change-Id: I04cf1a2736cb3b4f4fa61fcd11cb5ee6f0f6c816
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/86171
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/text/swriter/01/04090005.xhp
b/source/text/swriter/01/04090005.xhp
index 8c36b213a..a5a1d9dcb 100644
--- a/source/text/swriter/01/04090005.xhp
+++ b/source/text/swriter/01/04090005.xhp
@@ -64,7 +64,7 @@
<paragraph role="tablecontent" id="par_id3154571" xml-lang="en-US">Show
Variable</paragraph>
</tablecell>
<tablecell>
-<paragraph role="tablecontent" id="par_id3153669" xml-lang="en-US">Inserts the
current value of the variable that you click in the <emph>Selection
</emph>list.</paragraph>
+<paragraph role="tablecontent" id="par_id3153669" xml-lang="en-US">Inserts the
current value of the variable that you click in the
<emph>Select</emph>list.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -90,7 +90,7 @@
<tablecell>
<paragraph role="tablecontent" id="par_id3154829" xml-lang="en-US">Inserts a
new value for a variable or a User Field.</paragraph>
<paragraph role="tablecontent" id="par_id3149098" xml-lang="en-US">The value
of a variable in an Input field is only valid from where the field is inserted
and onwards. To change the value of the variable later in the document, insert
another Input field of the same name, but with a different value. However, the
value of a User Field is changed globally.</paragraph>
-<paragraph role="tablecontent" id="par_id3151255" xml-lang="en-US">The
variables are displayed in the <emph>Selection</emph> field. When you click the
<emph>Insert</emph> button, the dialog<link href="text/swriter/01/04090100.xhp"
name="Input Field"><emph>Input Field</emph></link> appears, where you can enter
the new value or additional text as a remark.</paragraph>
+<paragraph role="tablecontent" id="par_id3151255" xml-lang="en-US">The
variables are displayed in the <emph>Select</emph> field. When you click the
<emph>Insert</emph> button, the dialog <link
href="text/swriter/01/04090100.xhp" name="Input Field"><emph>Review
Fields</emph></link> appears, where you can enter the new value or additional
text as a remark.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -111,7 +111,7 @@
</tablerow>
<tablerow>
<tablecell>
-<paragraph role="tablecontent" id="par_id3156267" xml-lang="en-US">Show Page
Variable</paragraph>
+<paragraph role="tablecontent" id="par_id3156267" xml-lang="en-US">Show page
variable</paragraph>
</tablecell>
<tablecell>
<paragraph role="tablecontent" id="par_id3150588" xml-lang="en-US">Displays
the number of pages from the "Set page variable" reference point to this
field.</paragraph>
@@ -126,28 +126,26 @@
</tablecell>
</tablerow>
</table>
-<embed href="text/swriter/01/04090001.xhp#hinweis"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldvarpage/select"
id="bm_id3150684" localize="false"/>
+<paragraph role="heading" id="hd_id3888363" xml-lang="en-US"
level="2">Select<comment>on all tab pages this is called "Select", except for
"Cross-References", which uses "Selection"</comment></paragraph>
+<paragraph role="paragraph" id="par_id7453535" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/fldvarpage/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>
+<paragraph role="tip" id="par_id3326822" xml-lang="en-US">To quickly insert a
field from the <emph>Select</emph> list, hold down <switchinline
select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and
double-click the field.</paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/fldvarpage/numformat" id="bm_id3148875"
localize="false"/>
<paragraph role="paragraph" id="par_id0903200802243892"
xml-lang="en-US"><ahelp hid="." visibility="hidden">Click the format that you
want to apply to the selected field, or click "Additional formats" to define a
custom format.</ahelp></paragraph>
-<embed href="text/swriter/01/04090001.xhp#format"/>
-<paragraph role="paragraph" id="par_id3148886" xml-lang="en-US">For
user-defined fields, click the format that you want to apply in the
<emph>Format </emph>list, or click "Additional formats" to define a custom
format.</paragraph>
+<embed href="text/swriter/01/04090001.xhp#format"/><comment>Provides Format
header and explanation</comment>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldvarpage/name"
id="bm_id3150108" localize="false"/>
<paragraph role="paragraph" id="par_id0903200802243880"
xml-lang="en-US"><ahelp hid="." visibility="hidden">Type the name of the
user-defined field that you want to create.</ahelp></paragraph>
-<embed href="text/swriter/01/04090002.xhp#name"/>
+<embed href="text/swriter/01/04090002.xhp#name"/><comment>Provides Name header
and explanation</comment>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldvarpage/value"
id="bm_id3150119" localize="false"/>
<paragraph role="paragraph" id="par_id0903200802243951"
xml-lang="en-US"><ahelp hid="." visibility="hidden">Enter the contents that you
want to add to a user-defined field.</ahelp></paragraph>
<embed href="text/swriter/01/04090001.xhp#wert"/>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldvarpage/format"
id="bm_id3155871" localize="false"/>
<paragraph role="paragraph" id="par_id3155860" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/fldvarpage/format">In the <emph>Format</emph> list,
define if the value is inserted as text or a number.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldvarpage/select"
id="bm_id3150684" localize="false"/>
-<paragraph role="heading" id="hd_id3888363" xml-lang="en-US"
level="2">Select<comment>on "Document" and "DocInformation" tab page this is
called "Select", on the other tab pages "Selection"</comment></paragraph>
-<paragraph role="paragraph" id="par_id7453535" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/fldvarpage/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>
-<paragraph role="tip" id="par_id3326822" xml-lang="en-US">To quickly insert a
field from the list, hold down <switchinline select="sys"><caseinline
select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and
double-click the field.</paragraph>
+<embed href="text/swriter/01/04090001.xhp#hinweis"/><comment>Warns that
following types depend on the selection in the Type list</comment>
<paragraph role="paragraph" id="par_id3150696" xml-lang="en-US">In an HTML
document, two additional fields are available for the "Set variable" field
type: HTML_ON and HTML_OFF. The text that you type in the <emph>Value
</emph>box is converted to an opening HTML <link
href="text/shared/00/00000002.xhp#tags" name="tag">tag</link> (<Value>)
or to a closing HTML (</Value>) tag when the file is saved as an HTML
document, depending on the option that you select.</paragraph>
-<paragraph role="tip" id="par_id3149555" xml-lang="en-US">If you double-click
an entry while holding the Ctrl key or select the desired variable and press
the spacebar, it is immediately inserted into your document.</paragraph>
<paragraph role="heading" id="hd_id3155969" xml-lang="en-US"
level="2">Formula</paragraph>
-<paragraph role="paragraph" id="par_id3155982" xml-lang="en-US">This option is
only available if the "Insert formula" field type is selected.</paragraph>
+<paragraph role="paragraph" id="par_id3155982" xml-lang="en-US">This option is
only available if the "Insert Formula" field type is selected.</paragraph>
<embed href="text/swriter/01/04090003.xhp#hinweis"/>
<embed href="text/swriter/01/04090001.xhp#korrektur"/>
<section id="unsichtbar">
@@ -166,13 +164,13 @@
<section id="uebernehmen">
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldvarpage/apply"
id="bm_id3147069" localize="false"/>
<paragraph role="heading" id="hd_id3147057" xml-lang="en-US"
level="2">Apply</paragraph>
-<paragraph role="paragraph" id="par_id3155562" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/fldvarpage/apply">Adds the user-defined field to the
<emph>Selection</emph> list.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155562" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/fldvarpage/apply">Adds the user-defined field to the
<emph>Select</emph> list.</ahelp></paragraph>
<embed href="text/swriter/02/14040000.xhp#syuebernehmen"/>
</section>
<section id="loeschen">
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/fldvarpage/delete"
id="bm_id3151092" localize="false"/>
<paragraph role="heading" id="hd_id3151080" xml-lang="en-US"
level="2">Delete</paragraph>
-<paragraph role="paragraph" id="par_id3154769" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/fldvarpage/delete">Removes the user-defined field from
the selection list. You can only remove fields that are not used in the current
document.</ahelp> To remove a field that is used in the current document from
the list, first delete all instances of the field in the document, and then
remove it from the list.</paragraph>
+<paragraph role="paragraph" id="par_id3154769" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/fldvarpage/delete">Removes the user-defined field from
the select list. You can only remove fields that are not used in the current
document.</ahelp> To remove a field that is used in the current document from
the list, first delete all instances of the field in the document, and then
remove it from the list.</paragraph>
<table id="tbl_id3154080">
<tablerow>
<tablecell>
diff --git a/source/text/swriter/01/04090100.xhp
b/source/text/swriter/01/04090100.xhp
index bc3f06e89..935104d45 100644
--- a/source/text/swriter/01/04090100.xhp
+++ b/source/text/swriter/01/04090100.xhp
@@ -37,7 +37,7 @@
<paragraph role="paragraph" id="par_id3154470" xml-lang="en-US">To change the
content of an Input Field in a document, click the field, and then edit the
text in the lower box of the dialog.</paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/inputfielddialog/text" id="bm_id3154564"
localize="false"/>
<paragraph role="heading" id="hd_id3153669" xml-lang="en-US"
level="2">Reference</paragraph>
-<paragraph role="paragraph" id="par_id3154571" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/inputfielddialog/text">This box displays the name that
you entered in the <emph>Reference</emph> box of the Input Field on the
<emph>Functions</emph> tab of the <emph>Fields</emph> dialog. The box
underneath displays the contents of the field.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154571" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/inputfielddialog/text">This box displays the name that
you entered in the <emph>Reference</emph> box on the <emph>Functions</emph> or
<emph>Variables</emph> tab of the <emph>Fields</emph> dialog. The box
underneath displays the contents of the field.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/inputfielddialog/next" id="bm_id3149685"
localize="false"/>
<paragraph role="heading" id="hd_id3155897" xml-lang="en-US"
level="2">Next</paragraph>
<paragraph role="paragraph" id="par_id3149691" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/inputfielddialog/next">Jumps to the next input field in
the document.</ahelp> This button is only available when you position the
cursor directly before an input field, and then press Shift+Ctrl+F9.</paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
