summaryrefslogtreecommitdiff
path: root/source/text/swriter/01/mailmerge05.xhp
diff options
context:
space:
mode:
authorGabor Kelemen <kelemeng@gnome.hu>2017-03-30 21:04:01 +0200
committerGabor Kelemen <kelemeng@ubuntu.com>2017-04-02 20:37:53 +0000
commitf819eb227c337fc59416649218be6354d287de37 (patch)
tree0a2fc12cc476607fd55d4647b544a909e084eea9 /source/text/swriter/01/mailmerge05.xhp
parenta5b29c05af7c8cc038f953bda2995f8d99be5e04 (diff)
tdf#102930 Update Mail Merge Wizard Page 5 help
Sync to current UI, improve readability Change-Id: Ib756f8998ed88a63b8f2927677638dd6110a86f4 Reviewed-on: https://gerrit.libreoffice.org/35937 Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com> Tested-by: Gabor Kelemen <kelemeng@ubuntu.com>
Diffstat (limited to 'source/text/swriter/01/mailmerge05.xhp')
-rw-r--r--source/text/swriter/01/mailmerge05.xhp33
1 files changed, 22 insertions, 11 deletions
diff --git a/source/text/swriter/01/mailmerge05.xhp b/source/text/swriter/01/mailmerge05.xhp
index 441b7a4599..6ea99d0dde 100644
--- a/source/text/swriter/01/mailmerge05.xhp
+++ b/source/text/swriter/01/mailmerge05.xhp
@@ -22,7 +22,7 @@
<helpdocument version="1.0">
<meta>
<topic id="textswriter01mailmerge05xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Mail Merge Wizard - Layout</title>
+<title id="tit" xml-lang="en-US">Mail Merge Wizard - Adjust Layout</title>
<filename>/text/swriter/01/mailmerge05.xhp</filename>
</topic>
<history>
@@ -32,28 +32,39 @@
<body>
<section id="layout">
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/MMLayoutPage" id="bm_id8489030" localize="false"/>
-<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge05.xhp">Mail Merge Wizard - Adjust Layout</link></paragraph>
+<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge05.xhp">Mail Merge Wizard - Adjust layout</link></paragraph>
<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specify the position of the address blocks and salutations on the documents.</ahelp></paragraph>
</section>
+<paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="2">Address Block Position</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/top" id="bm_id1113010" localize="false"/>
+<paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="3" l10n="NEW">From top</paragraph>
+<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the amount of space to leave between the top edge of the page and the top edge of the address block.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/align" id="bm_id7631458" localize="false"/>
-<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Align to text body</paragraph>
+<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="3" l10n="NEW">Align to text body</paragraph>
<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Aligns the frame that contains the address block to the left page margin.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/left" id="bm_id7862483" localize="false"/>
-<paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="2" l10n="NEW">From left</paragraph>
+<paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="3" l10n="NEW">From left</paragraph>
<paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the amount of space to leave between the left edge of the page and the left edge of the address block.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/top" id="bm_id1113010" localize="false"/>
-<paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2" l10n="NEW">From top</paragraph>
-<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the amount of space to leave between the top edge of the page and the top edge of the address block.</ahelp></paragraph>
+<paragraph role="heading" id="par_idN10545" xml-lang="en-US" level="2">Salutation Position</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/up" id="bm_id656758" localize="false"/>
-<paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="2" l10n="NEW">Up</paragraph>
+<paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="3" l10n="NEW">Up</paragraph>
<paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Moves the salutation up.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/down" id="bm_id3112582" localize="false"/>
-<paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="2" l10n="NEW">Down</paragraph>
+<paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="3" l10n="NEW">Down</paragraph>
<paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Moves the salutation down.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/example" id="bm_id3112585" localize="false"/>
+<paragraph role="heading" id="par_idN10573" xml-lang="en-US" level="3" l10n="NEW">Preview area</paragraph>
+<paragraph role="paragraph" id="par_idN10577" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Provides a preview of the salutation positioning on the page.</ahelp></paragraph>
+
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/zoom" id="bm_id628070" localize="false"/>
-<paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="2" l10n="NEW">Zoom</paragraph>
+<paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="3" l10n="NEW">Zoom</paragraph>
<paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a magnification for the print preview.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN106AF" xml-lang="en-US" l10n="NEW">Use the commands in the context menu of the preview to move the view up and down.</paragraph>
-<paragraph role="paragraph" id="par_idN10580" xml-lang="en-US" l10n="CHG"><link href="text/swriter/01/mailmerge06.xhp" name="Mail Merge Wizard - Edit document">Mail Merge Wizard - Edit document</link></paragraph>
+<paragraph id="hd_idN10584" role="paragraph" xml-lang="en-US">Press the <emph>Finish</emph> button and use the <link href="text/swriter/mailmergetoolbar.xhp">Mail Merge Toolbar</link> to finish the mail merge process.</paragraph>
+
</body>
+<section id="relatedtopics">
+<paragraph role="paragraph" id="par_idN10571" xml-lang="en-US"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link> overview</paragraph>
+</section>
</helpdocument>