summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Kelemen <kelemeng@gnome.hu>2017-03-09 00:02:16 +0100
committerGabor Kelemen <kelemeng@ubuntu.com>2017-04-02 20:30:35 +0000
commit7f8eec4aea1271f18ba55c771a8d81171ebbba48 (patch)
tree8e5898d8387a9c329aa1394f8093a3be31ebbd5a
parent0d1048bd6a3ad7ca6b6827c74c70e4c65ea32c54 (diff)
tdf#102930 Update Mail Merge Wizard pages - 00
- Remove embeds for dropped wizard pages. - Drop redundant bookmarks - Improve text a bit for better readability Change-Id: I04b4fd9936719a52368e56c8804328b528a782a4 Reviewed-on: https://gerrit.libreoffice.org/35931 Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com> Tested-by: Gabor Kelemen <kelemeng@ubuntu.com>
-rw-r--r--source/text/swriter/01/mailmerge00.xhp18
1 files changed, 8 insertions, 10 deletions
diff --git a/source/text/swriter/01/mailmerge00.xhp b/source/text/swriter/01/mailmerge00.xhp
index afbed6074a..64e90bfe51 100644
--- a/source/text/swriter/01/mailmerge00.xhp
+++ b/source/text/swriter/01/mailmerge00.xhp
@@ -30,31 +30,29 @@
</meta>
<body>
<section id="mailmerge">
-<bookmark xml-lang="en-US" branch="hid/.uno:MergeDialog" id="bm_id4642780" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:MailMergeWizard" id="bm_id6627657" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:MailMergeWizard" id="bm_id5430463" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:MergeDialog" id="bm_id9926450" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:MergeDialog" id="bm_id9926450" localize="false"/><comment>UFI: inserted help ids</comment><comment>UFI: moved DSBFormLetter ID to shared/main0212</comment><paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link></paragraph>
+<paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link></paragraph>
<paragraph role="paragraph" id="par_idN10559" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Starts the Mail Merge Wizard to create form letters or send e-mail messages to many recipients.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/swriter/00/00000406.xhp#mmwizard"/>
</section>
+<paragraph role="paragraph" id="par_idN10563" xml-lang="en-US">Before starting the Mail Merge Wizard you might want to review the whole process of creating a mail merge:</paragraph>
<embed href="text/swriter/guide/form_letters_main.xhp#form_letters_main"/>
<embed href="text/swriter/01/mailmerge01.xhp#startingdocument"/>
<embed href="text/swriter/01/mailmerge02.xhp#documenttype"/>
<embed href="text/swriter/01/mailmerge03.xhp#addresses"/>
<embed href="text/swriter/01/mailmerge04.xhp#greetingline"/>
<embed href="text/swriter/01/mailmerge05.xhp#layout"/>
-<embed href="text/swriter/01/mailmerge06.xhp#preparemerge"/>
-<embed href="text/swriter/01/mailmerge07.xhp#personalize"/>
-<embed href="text/swriter/01/mailmerge08.xhp#saveprintsend"/>
<embed href="text/shared/00/00000001.xhp#abbrechen"/>
<embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
<embed href="text/shared/00/00000001.xhp#weiterautopi"/>
-<paragraph role="paragraph" id="par_idN105CC" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge01.xhp" name="Mail Merge Wizard - Starting document">Mail Merge Wizard - Starting document</link></paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/form_letters_main.xhp#form_letters"/>
-<paragraph role="paragraph" id="par_idN105F6" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/01150000.xhp">Configurable Mail Merge dialog</link></paragraph>
+<paragraph role="paragraph" id="par_idN105CC" xml-lang="en-US" l10n="NEW">First step: <link href="text/swriter/01/mailmerge01.xhp" name="Mail Merge Wizard - Select starting document">Mail Merge Wizard - Select starting document</link>.</paragraph>
+
+<section id="relatedtopics">
+ <embed href="text/swriter/guide/form_letters_main.xhp#form_letters"/>
+ <paragraph role="paragraph" id="par_idN105F6" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/01150000.xhp">Configurable Mail Merge dialog</link></paragraph>
+</section>
</body>
</helpdocument>