summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2007-04-02 14:50:44 +0000
committerRüdiger Timm <rt@openoffice.org>2007-04-02 14:50:44 +0000
commite50894d55e309d3200fa06badcb29fd36ca1cbd3 (patch)
treeacadc23d0e0a9e802ff42227f8df05c360dcebb5
parent7c21343eb3aa4431685d041ccbec55fb4599d00e (diff)
INTEGRATION: CWS hcshared08 (1.5.190); FILE MERGED
2007/02/09 08:19:52 ufi 1.5.190.1: before resync to 203
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mailmerge06.xhp14
1 files changed, 8 insertions, 6 deletions
diff --git a/helpcontent2/source/text/swriter/01/mailmerge06.xhp b/helpcontent2/source/text/swriter/01/mailmerge06.xhp
index c3a6956480..c92d5a406f 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge06.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge06.xhp
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
+<!--
+ ***********************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: mailmerge06.xhp,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 02:09:54 $
+ * last change: $Author: rt $ $Date: 2007-04-02 15:50:44 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -32,7 +33,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
- ************************************************************************-->
+ ************************************************************************
+ -->
<helpdocument version="1.0">
<meta>
@@ -42,7 +44,7 @@
</topic>
<history>
<created date="2004-07-07T14:08:14">UFI: Mail Merge Wizard page 6</created>
-<lastedited date="2004-10-05T09:39:50">DEDR: reviewed</lastedited>
+<lastedited date="2007-02-05T09:44:44">DEDR: reviewed</lastedited>
</history>
</meta>
<body>
@@ -64,6 +66,6 @@
<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_EDIT" id="bm_id1743827" localize="false"/>
<paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2" l10n="NEW">Edit Document</paragraph>
<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Minimizes the wizard so that you can edit the main mail merge document for all recipients.</ahelp> To return to the wizard, click the <emph>Return to Mail Merge Wizard</emph> button.</paragraph>
-<paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge07.xhp" name="Mail Merge Wizard - Personalize">Mail Merge Wizard - Personalize document</link></paragraph>
+<paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="CHG"><link href="text/swriter/01/mailmerge07.xhp" name="Mail Merge Wizard - Personalize document">Mail Merge Wizard - Personalize document</link></paragraph>
</body>
</helpdocument>