summaryrefslogtreecommitdiffstats
path: root/helpcontent2/source/text/swriter/01/mailmerge00.xhp
diff options
context:
space:
mode:
authorThomas Lange [tl] <tl@openoffice.org>2010-01-06 12:22:41 +0100
committerThomas Lange [tl] <tl@openoffice.org>2010-01-06 12:22:41 +0100
commit85dc8365fab8eb9b512279196bf97dbd80417cc8 (patch)
tree3245e550c1f9250c64a78fa9d6ffc493ccd3f1f0 /helpcontent2/source/text/swriter/01/mailmerge00.xhp
parenttl74: merge with DEV300 m60 (diff)
parentCWS-TOOLING: integrate CWS localization37fix_DEV300 (diff)
downloadhelp-85dc8365fab8eb9b512279196bf97dbd80417cc8.tar.gz
help-85dc8365fab8eb9b512279196bf97dbd80417cc8.zip
cws tl74: merge with DEV300_m68; AND Unix LF conversion for some files!
Diffstat (limited to 'helpcontent2/source/text/swriter/01/mailmerge00.xhp')
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mailmerge00.xhp3
1 files changed, 1 insertions, 2 deletions
diff --git a/helpcontent2/source/text/swriter/01/mailmerge00.xhp b/helpcontent2/source/text/swriter/01/mailmerge00.xhp
index 0b2f4eff8d..2f9ee0a09f 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge00.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge00.xhp
@@ -47,9 +47,8 @@
<bookmark xml-lang="en-US" branch="hid/20367" id="bm_id4642780" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_MAILMERGE_WIZARD" 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:DSBFormLetter" id="bm_id5004119" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_QRY_MERGE" 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><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>
+<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="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">