From 675d93ea5dcda2eee46e3820190249086428fbf7 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Mon, 27 Mar 2006 11:31:08 +0000
Subject: [PATCH] INTEGRATION: CWS hc680fin (1.5.14); FILE MERGED 2006/03/20
 10:52:00 ufi 1.5.14.2: RESYNC: (1.5-1.6); FILE MERGED 2005/11/23 08:32:44 ufi
 1.5.14.1: *** empty log message ***

---
 .../source/text/swriter/01/mailmerge00.xhp    | 50 +++++++++----------
 1 file changed, 23 insertions(+), 27 deletions(-)
diff --git a/helpcontent2/source/text/swriter/01/mailmerge00.xhp b/helpcontent2/source/text/swriter/01/mailmerge00.xhp
index 0e3502b808..efb763d260 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge00.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge00.xhp
@@ -2,36 +2,34 @@
 <!--
  ***********************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
  *
- *  $RCSfile: mailmerge00.xhp,v $
- *
- *  $Revision: 1.6 $
- *
- *  last change: $Author: vg $ $Date: 2006-03-13 14:19:28 $
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ *         - GNU Lesser General Public License Version 2.1
  *
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  Sun Microsystems Inc., October, 2000
  *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
  *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
  *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
  *
  ************************************************************************
  -->
@@ -49,9 +47,7 @@
 </meta>
 <body>
 <section id="mailmerge">
-<bookmark xml-lang="en-US" branch="index" id="bm_id6415601"><bookmark_value>wizards;form letters</bookmark_value>
-<bookmark_value>Mail Merge Wizard</bookmark_value>
-</bookmark>
+<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"/>
