[Libreoffice-commits] help.git: source/text

Gabor Kelemen kelemeng at gnome.hu
Tue Oct 31 07:21:49 UTC 2017


 source/text/shared/autopi/01020200.xhp |   20 ++++++++++----------
 source/text/shared/autopi/01020300.xhp |   20 ++++++++++----------
 source/text/shared/autopi/01020400.xhp |    6 +++---
 source/text/shared/autopi/01020500.xhp |    8 ++++----
 4 files changed, 27 insertions(+), 27 deletions(-)

New commits:
commit 284c7122cb4aeaff14b6b9017fcccf81968f5fd5
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date:   Tue Oct 31 00:01:54 2017 +0100

    Fix the Fax Wizard HID mess
    
    Some bookmarks were missing, most were misplaced
    
    Change-Id: I5663999f874fe554cd74bb9b76f0fb9dae83852a
    Reviewed-on: https://gerrit.libreoffice.org/44092
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/source/text/shared/autopi/01020200.xhp b/source/text/shared/autopi/01020200.xhp
index c083482f7..06b94e7d3 100644
--- a/source/text/shared/autopi/01020200.xhp
+++ b/source/text/shared/autopi/01020200.xhp
@@ -40,28 +40,28 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#autopilotfax2"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_CHKUSESUBJECT" id="bm_id6044801" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_CHKUSELOGO" id="bm_id6044801" localize="false"/>
 <paragraph role="heading" id="par_idN105D7" xml-lang="en-US" level="2">Logo</paragraph>
 <paragraph role="paragraph" id="par_idN105DB" xml-lang="en-US"><ahelp hid=".">Includes a company logo.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_CHKUSESALUTATION" id="bm_id1317789" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_CHKUSEDATE" id="bm_id1317789" localize="false"/>
 <paragraph role="heading" id="par_idN105DE" xml-lang="en-US" level="2">Date</paragraph>
 <paragraph role="paragraph" id="par_idN105E2" xml-lang="en-US"><ahelp hid=".">Includes a date field.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN105E5" xml-lang="en-US" level="2">Type of message</paragraph>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_LSTSALUTATION" id="bm_id8609881" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_CHKUSEGREETING" id="bm_id9611804" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_CHKUSECOMMUNICATIONTYPE" id="bm_id8609881" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_LSTCOMMUNICATIONTYPE" id="bm_id9611804" localize="false"/>
 <paragraph role="paragraph" id="par_idN105E9" xml-lang="en-US"><ahelp hid=".">Includes a communication type line. Select the line from the list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_LSTGREETING" id="bm_id1488998" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_CHKUSESUBJECT" id="bm_id1488998" localize="false"/>
 <paragraph role="heading" id="par_idN105EC" xml-lang="en-US" level="2">Subject line</paragraph>
 <paragraph role="paragraph" id="par_idN105F0" xml-lang="en-US"><ahelp hid=".">Includes a subject line.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_CHKUSEFOOTER" id="bm_id248725" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_OPTSENDERPLACEHOLDER" id="bm_id9913937" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_CHKUSESALUTATION" id="bm_id248725" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_LSTSALUTATION" id="bm_id9913937" localize="false"/>
 <paragraph role="heading" id="par_idN105F3" xml-lang="en-US" level="2">Salutation</paragraph>
 <paragraph role="paragraph" id="par_idN105F7" xml-lang="en-US"><ahelp hid=".">Includes a salutation. Select the salutation from the list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_OPTSENDERDEFINE" id="bm_id2940153" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_TXTSENDERNAME" id="bm_id8901944" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_CHKUSEGREETING" id="bm_id2940153" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_LSTGREETING" id="bm_id8901944" localize="false"/>
 <paragraph role="heading" id="par_idN105FA" xml-lang="en-US" level="2">Complimentary close</paragraph>
 <paragraph role="paragraph" id="par_idN105FE" xml-lang="en-US"><ahelp hid=".">Includes a greeting. Select the greeting from the list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_TXTSENDERSTREET" id="bm_id5031891" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_CHKUSEFOOTER" id="bm_id5031891" localize="false"/>
 <paragraph role="heading" id="par_idN10601" xml-lang="en-US" level="2">Footer</paragraph>
 <paragraph role="paragraph" id="par_idN10605" xml-lang="en-US"><ahelp hid=".">Includes a footer.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3148491" xml-lang="en-US"><link href="text/shared/autopi/01020300.xhp" name="Go to Fax Wizard - Sender and Recipient">Go to Fax Wizard - Sender and Recipient</link></paragraph>
diff --git a/source/text/shared/autopi/01020300.xhp b/source/text/shared/autopi/01020300.xhp
index 97fedfa29..d14f85de1 100644
--- a/source/text/shared/autopi/01020300.xhp
+++ b/source/text/shared/autopi/01020300.xhp
@@ -40,24 +40,24 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#autopilotfax3"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_TXTSENDERSTATE" id="bm_id2698141" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_OPTSENDERPLACEHOLDER" id="bm_id2698141" localize="false"/>
 <paragraph role="heading" id="par_idN105DE" xml-lang="en-US" level="3">Use user data for return address</paragraph>
 <paragraph role="paragraph" id="par_idN105E2" xml-lang="en-US"><ahelp hid=".">Inserts placeholders for the address on the fax template. Later in the fax document, click the placeholder to enter the actual data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_TXTSENDERCITY" id="bm_id8446302" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_OPTSENDERDEFINE" id="bm_id8446302" localize="false"/>
 <paragraph role="heading" id="par_idN105E5" xml-lang="en-US" level="3">New return address</paragraph>
 <paragraph role="paragraph" id="par_idN105E9" xml-lang="en-US"><ahelp hid=".">Select to enter the address data in the following text boxes. The data is inserted as normal text in the fax document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_TXTSENDERFAX" id="bm_id5530869" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_OPTRECEIVERPLACEHOLDER" id="bm_id5629749" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_OPTRECEIVERDATABASE" id="bm_id6467787" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_TXTFOOTER" id="bm_id3894466" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_CHKFOOTERNEXTPAGES" id="bm_id5997192" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_CHKFOOTERPAGENUMBERS" id="bm_id9666737" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_TXTSENDERNAME" id="bm_id5530869" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_TXTSENDERSTREET" id="bm_id5629749" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_TXTSENDERPOSTCODE" id="bm_id6467787" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_TXTSENDERSTATE" id="bm_id3894466" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_TXTSENDERCITY" id="bm_id5997192" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_TXTSENDERFAX" id="bm_id9666737" localize="false"/>
 <paragraph role="heading" id="par_idN105EC" xml-lang="en-US" level="4">(Address data fields)</paragraph>
 <paragraph role="paragraph" id="par_idN105EF" xml-lang="en-US"><ahelp hid=".">Enter the sender address data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_TXTTEMPLATENAME" id="bm_id1582384" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_OPTRECEIVERPLACEHOLDER" id="bm_id1582384" localize="false"/>
 <paragraph role="heading" id="par_idN105F9" xml-lang="en-US" level="3">Use placeholders as receiver address</paragraph>
 <paragraph role="paragraph" id="par_idN105FD" xml-lang="en-US"><ahelp hid=".">Inserts placeholders for the address on the fax template. Later in the fax document, click the placeholder to enter the actual data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_FILETEMPLATEPATH" id="bm_id6142765" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_OPTRECEIVERDATABASE" id="bm_id6142765" localize="false"/>
 <paragraph role="heading" id="par_idN10600" xml-lang="en-US" level="3">Use address database for mail merge</paragraph>
 <paragraph role="paragraph" id="par_idN10604" xml-lang="en-US"><ahelp hid=".">Inserts database fields for a later mail merge with the fax document.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3154938" xml-lang="en-US"><link href="text/shared/autopi/01020400.xhp" name="Go to Fax Wizard - Footer">Go to Fax Wizard - Footer</link></paragraph>
diff --git a/source/text/shared/autopi/01020400.xhp b/source/text/shared/autopi/01020400.xhp
index 49980f920..15a67523f 100644
--- a/source/text/shared/autopi/01020400.xhp
+++ b/source/text/shared/autopi/01020400.xhp
@@ -40,13 +40,13 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#autopilotfax4"/>
 </section>
-<!-- removed HID 41158 -->
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_TXTFOOTER" id="bm_id3894466" localize="false"/>
 <paragraph role="heading" id="par_idN105D7" xml-lang="en-US" level="2">Footer</paragraph>
 <paragraph role="paragraph" id="par_idN105DB" xml-lang="en-US"><ahelp hid=".">Specifies the text to be printed in the footer area.</ahelp></paragraph>
-<!-- removed HID 41159 -->
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_CHKFOOTERNEXTPAGES" id="bm_id5997192" localize="false"/>
 <paragraph role="heading" id="par_idN105DE" xml-lang="en-US" level="3">Include only on second and following pages</paragraph>
 <paragraph role="paragraph" id="par_idN105E1" xml-lang="en-US"><ahelp hid=".">Suppresses the footer on the first page of a multipage fax document.</ahelp></paragraph>
-<!-- removed HID 41160 -->
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_CHKFOOTERPAGENUMBERS" id="bm_id9666737" localize="false"/>
 <paragraph role="heading" id="par_idN105E4" xml-lang="en-US" level="3">Include page number</paragraph>
 <paragraph role="paragraph" id="par_idN105E7" xml-lang="en-US"><ahelp hid=".">Prints a page number in the footer area.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3152812" xml-lang="en-US"><link href="text/shared/autopi/01020500.xhp" name="Go to Fax Wizard - Name and location">Go to Fax Wizard - Name and location</link></paragraph>
diff --git a/source/text/shared/autopi/01020500.xhp b/source/text/shared/autopi/01020500.xhp
index 08fbd9ed5..8a1d8e892 100644
--- a/source/text/shared/autopi/01020500.xhp
+++ b/source/text/shared/autopi/01020500.xhp
@@ -40,16 +40,16 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#autopilotfax5"/>
 </section>
-<!-- removed HID 41163 -->
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_TXTTEMPLATENAME" id="bm_id9666737" localize="false"/>
 <paragraph role="heading" id="par_idN105D7" xml-lang="en-US" level="2">Template name</paragraph>
 <paragraph role="paragraph" id="par_idN105DB" xml-lang="en-US"><ahelp hid=".">Enter the name of the fax template.</ahelp></paragraph>
-<!-- removed HID 41167 -->
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_FAXWIZ_CMDPATH" id="bm_id9666738" localize="false"/>
 <paragraph role="heading" id="par_idN105DE" xml-lang="en-US" level="2">...</paragraph>
 <paragraph role="paragraph" id="par_idN105E2" xml-lang="en-US"><ahelp hid=".">Click to enter or select the complete path, including the file name of the fax template.</ahelp></paragraph>
-<!-- removed HID 41165 -->
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_OPTCREATEFAX" id="bm_id9666739" localize="false"/>
 <paragraph role="heading" id="par_idN105E5" xml-lang="en-US" level="3">Create a fax from this template</paragraph>
 <paragraph role="paragraph" id="par_idN105E9" xml-lang="en-US"><ahelp hid=".">Creates and saves the fax template, then opens a new fax document based on that template.</ahelp></paragraph>
-<!-- removed HID 41166 -->
+<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_OPTMAKECHANGES" id="bm_id9666740" localize="false"/>
 <paragraph role="heading" id="par_idN105EC" xml-lang="en-US" level="3">Make manual changes to this fax template</paragraph>
 <paragraph role="paragraph" id="par_idN105F0" xml-lang="en-US"><ahelp hid=".">Creates and saves the fax template, then opens the template for further editing.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3151119" xml-lang="en-US"><link href="text/shared/autopi/01020000.xhp" name="Go to Fax Wizard">Go to Fax Wizard</link></paragraph>


More information about the Libreoffice-commits mailing list