#i10000# Undo CWS integration hc680fin

8 files changed, 218 insertions, 401 deletions

diff --git a/helpcontent2/source/text/shared/autopi/01020000.xhp b/helpcontent2/source/text/shared/autopi/01020000.xhp
index 2da364dd5b..6ae2690450 100644
--- a/helpcontent2/source/text/shared/autopi/01020000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020000.xhp
@@ -1,56 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
  *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
+ *  $RCSfile: 01020000.xhp,v $
  *
- *  Sun Microsystems Inc., October, 2000
+ *  $Revision: 1.7 $
  *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  last change: $Author: obo $ $Date: 2006-03-28 13:29:16 $
  *
- *  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.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- *  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
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 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.
  *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
+ *    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
  *
  ************************************************************************-->
 	
@@ -62,7 +42,7 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-10-31T13:17:34">UFI: edited to suit new Wizard
+<lastedited date="2004-12-15T11:00:30">UFI: edited to suit new Wizard
 YJ: checked</lastedited>
 </history>
 </meta>
@@ -85,15 +65,13 @@ YJ: checked</lastedited>
 <embed href="text/shared/autopi/01020300.xhp#seite3"/>
 <embed href="text/shared/autopi/01020400.xhp#seite4"/>
 <embed href="text/shared/autopi/01020500.xhp#seite5"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD_BACK" id="bm_id2001709" localize="false"/>
 <paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="2" l10n="U" oldref="5">Back</paragraph>
-<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".">Click the<emph> Back </emph>button to view the settings chosen on the previous page. The current settings will not be modified or deleted if you click this button.<emph> Back </emph>will be active from the second page onwards.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD_NEXT" id="bm_id9227271" localize="false"/>
+<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="6">Click the<emph> Back </emph>button to view the settings chosen on the previous page. The current settings will not be modified or deleted if you click this button.<emph> Back </emph>will be active from the second page onwards.</paragraph>
 <paragraph role="heading" id="hd_id3147335" xml-lang="en-US" level="2" l10n="U" oldref="7">Next</paragraph>
-<paragraph role="paragraph" id="par_id3156117" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid=".">The wizard saves the current settings and goes to the next page. The<emph> Next </emph>button will become inactive once you have reached the last page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD_CREATE" id="bm_id2856532" localize="false"/>
+<paragraph role="paragraph" id="par_id3156117" xml-lang="en-US" l10n="U" oldref="8">The wizard saves the current settings and goes to the next page. The<emph> Next </emph>button will become inactive once you have reached the last page.</paragraph>
 <paragraph role="heading" id="hd_id3152350" xml-lang="en-US" level="2" l10n="CHG" oldref="9">Finish</paragraph>
-<paragraph role="paragraph" id="par_id3146948" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid=".">According to your selections, the wizard creates a document template and saves it. A new document based on the template appears in the work area, with the filename "UntitledX".</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD_CANCEL" id="bm_id833765" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<paragraph role="paragraph" id="par_id3146948" xml-lang="en-US" l10n="U" oldref="10">According to your selections, the wizard creates a document template and saves it. A new document based on the template appears in the work area, with the filename "UntitledX".</paragraph>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<paragraph role="note" id="par_id3149457" xml-lang="en-US" l10n="U" oldref="15">$[officename] saves the current settings in the wizard according to the selected document template. These settings are used as the default settings the next time you activate the wizard.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01020100.xhp b/helpcontent2/source/text/shared/autopi/01020100.xhp
index 634444e767..5725f9cccc 100755
--- a/helpcontent2/source/text/shared/autopi/01020100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020100.xhp
@@ -1,56 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
  *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
+ *  $RCSfile: 01020100.xhp,v $
  *
- *  Sun Microsystems Inc., October, 2000
+ *  $Revision: 1.5 $
  *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  last change: $Author: obo $ $Date: 2006-03-28 13:29:16 $
  *
- *  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.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- *  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
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 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.
  *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
+ *    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
  *
  ************************************************************************-->
 	
@@ -62,29 +42,25 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-10-31T13:26:40">UFI: edited for new Wizard
+<lastedited date="2004-09-30T13:14:27">UFI: edited for new Wizard
 YJ: checked</lastedited>
 </history>
 </meta>
 <body>
 <section id="seite1">
 <bookmark xml-lang="en-US" branch="hid/HID_FAX_PAGE1" id="bm_id3155364" localize="false"/>
-<paragraph role="heading" id="hd_id3109850" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/autopi/01020100.xhp" name="Fax Wizard - Page Design">Fax Wizard - Page Design</link></paragraph>
+<paragraph role="heading" id="hd_id3109850" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/autopi/01020100.xhp" name="AutoPilot Fax - Page 1">Fax Wizard - Page Design</link></paragraph>
 <paragraph role="paragraph" id="par_id3156027" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_FAX_PAGE1">Defines the style of your fax document.</ahelp></paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3147291" xml-lang="en-US" l10n="E" localize="false"><link href="text/shared/00/00000401.xhp#autopilotfax1"><embedvar href="text/shared/00/00000004.xhp#wie"/></link></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZ_OPTBUSINESSFAX" id="bm_id7710806" localize="false"/>
 <paragraph role="heading" id="par_idN105D7" xml-lang="en-US" level="2" l10n="NEW">Business Fax</paragraph>
 <paragraph role="paragraph" id="par_idN105DB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Creates a fax template for a business-style fax.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZ_LSTBUSINESSSTYLE" id="bm_id3071077" localize="false"/>
 <paragraph role="heading" id="par_idN105DE" xml-lang="en-US" level="3" l10n="NEW">Style</paragraph>
 <paragraph role="paragraph" id="par_idN105E2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the predefined style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZ_OPTPRIVATEFAX" id="bm_id7935728" localize="false"/>
 <paragraph role="heading" id="par_idN105E5" xml-lang="en-US" level="2" l10n="NEW">Private Fax</paragraph>
 <paragraph role="paragraph" id="par_idN105E9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Creates a fax template for a private fax.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_LSTPRIVATESTYLE" id="bm_id9333780" localize="false"/>
 <paragraph role="heading" id="par_idN105EC" xml-lang="en-US" level="3" l10n="NEW">Style</paragraph>
 <paragraph role="paragraph" id="par_idN105F0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the predefined style.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3156002" xml-lang="en-US" l10n="CHG" oldref="15"><link href="text/shared/autopi/01020200.xhp" name="Go to Fax Wizard - Items to include">Go to Fax Wizard - Items to include</link></paragraph>
+<paragraph role="paragraph" id="par_id3156002" xml-lang="en-US" l10n="CHG" oldref="15"><link href="text/shared/autopi/01020200.xhp" name="Go to AutoPilot Fax - Page 2">Go to Fax Wizard - Printed items</link></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01020200.xhp b/helpcontent2/source/text/shared/autopi/01020200.xhp
index b549aa47a1..e7eb10d5a5 100755
--- a/helpcontent2/source/text/shared/autopi/01020200.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020200.xhp
@@ -1,102 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
  *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
+ *  $RCSfile: 01020200.xhp,v $
  *
- *  Sun Microsystems Inc., October, 2000
+ *  $Revision: 1.5 $
  *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  last change: $Author: obo $ $Date: 2006-03-28 13:29:16 $
  *
- *  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.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- *  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
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 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.
  *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
+ *    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
  *
  ************************************************************************-->
 	
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedautopi01020200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Fax Wizard - Items to include</title>
+<title id="tit" xml-lang="en-US">Fax Wizard - Page 2</title>
 <filename>/text/shared/autopi/01020200.xhp</filename>
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-10-31T13:27:03">UFI: edited for new Wizard
+<lastedited date="2004-09-30T14:54:35">UFI: edited for new Wizard
 YJ: checked</lastedited>
 </history>
 </meta>
 <body>
 <section id="seite2">
 <bookmark xml-lang="en-US" branch="hid/HID_FAX_PAGE2" id="bm_id3150808" localize="false"/>
-<paragraph role="heading" id="hd_id3157898" xml-lang="en-US" level="1" l10n="CHG" oldref="4"><link href="text/shared/autopi/01020200.xhp" name="Fax Wizard - Items to include">Fax Wizard - Items to include</link></paragraph>
+<paragraph role="heading" id="hd_id3157898" xml-lang="en-US" level="1" l10n="CHG" oldref="4"><link href="text/shared/autopi/01020200.xhp" name="AutoPilot Fax - Page 2">Fax Wizard - Printed Items</link></paragraph>
 <paragraph role="paragraph" id="par_id3147571" xml-lang="en-US" l10n="CHG" oldref="3"><ahelp hid="HID_FAX_PAGE2">Specifies the fax elements to be printed.</ahelp></paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="E" localize="false"><link href="text/shared/00/00000401.xhp#autopilotfax2"><embedvar href="text/shared/00/00000004.xhp#wie"/></link></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_CHKUSESUBJECT" id="bm_id6044801" localize="false"/>
-<paragraph role="heading" id="par_idN105D7" xml-lang="en-US" level="2" l10n="NEW">Logo</paragraph>
+<paragraph role="heading" id="par_idN105D7" xml-lang="en-US" level="2" l10n="NEW">Company logo</paragraph>
 <paragraph role="paragraph" id="par_idN105DB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Includes a company logo.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_CHKUSESALUTATION" id="bm_id1317789" localize="false"/>
 <paragraph role="heading" id="par_idN105DE" xml-lang="en-US" level="2" l10n="NEW">Date</paragraph>
 <paragraph role="paragraph" id="par_idN105E2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Includes a date field.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN105E5" xml-lang="en-US" level="2" l10n="NEW">Type of message</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_LSTSALUTATION" id="bm_id8609881" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_CHKUSEGREETING" id="bm_id9611804" localize="false"/>
+<paragraph role="heading" id="par_idN105E5" xml-lang="en-US" level="2" l10n="NEW">Communication Type</paragraph>
 <paragraph role="paragraph" id="par_idN105E9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Includes a communication type line. Select the line from the list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_LSTGREETING" id="bm_id1488998" localize="false"/>
 <paragraph role="heading" id="par_idN105EC" xml-lang="en-US" level="2" l10n="NEW">Subject line</paragraph>
 <paragraph role="paragraph" id="par_idN105F0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Includes a subject line.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_CHKUSEFOOTER" id="bm_id248725" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTSENDERPLACEHOLDER" id="bm_id9913937" localize="false"/>
 <paragraph role="heading" id="par_idN105F3" xml-lang="en-US" level="2" l10n="NEW">Salutation</paragraph>
 <paragraph role="paragraph" id="par_idN105F7" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Includes a salutation. Select the salutation from the list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41136" id="bm_id2940153" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/41137" id="bm_id8901944" localize="false"/>
-<paragraph role="heading" id="par_idN105FA" xml-lang="en-US" level="2" l10n="NEW">Complimentary close</paragraph>
+<paragraph role="heading" id="par_idN105FA" xml-lang="en-US" level="2" l10n="NEW">Greeting</paragraph>
 <paragraph role="paragraph" id="par_idN105FE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Includes a greeting. Select the greeting from the list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41138" id="bm_id5031891" localize="false"/>
 <paragraph role="heading" id="par_idN10601" xml-lang="en-US" level="2" l10n="NEW">Footer</paragraph>
 <paragraph role="paragraph" id="par_idN10605" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Includes a footer.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="CHG" oldref="1"><link href="text/shared/autopi/01020300.xhp" name="Go to Fax Wizard - Sender and Recipient">Go to Fax Wizard - Sender and Recipient</link></paragraph>
+<paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="CHG" oldref="1"><link href="text/shared/autopi/01020300.xhp" name="Go to AutoPilot Fax - Page 3">Go to Fax Wizard - Recipient and sender</link></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01020300.xhp b/helpcontent2/source/text/shared/autopi/01020300.xhp
index 9ccd883f8f..a01aee3846 100755
--- a/helpcontent2/source/text/shared/autopi/01020300.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020300.xhp
@@ -1,98 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
  *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
+ *  $RCSfile: 01020300.xhp,v $
  *
- *  Sun Microsystems Inc., October, 2000
+ *  $Revision: 1.5 $
  *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  last change: $Author: obo $ $Date: 2006-03-28 13:29:16 $
  *
- *  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.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- *  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
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 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.
  *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
+ *    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
  *
  ************************************************************************-->
 	
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedautopi01020300xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Fax Wizard - Sender and Recipient</title>
+<title id="tit" xml-lang="en-US">Fax Wizard - Page 3</title>
 <filename>/text/shared/autopi/01020300.xhp</filename>
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-10-31T13:33:38">UFI: edited for new Wizard
+<lastedited date="2004-09-30T14:56:24">UFI: edited for new Wizard
 YJ: checked</lastedited>
 </history>
 </meta>
 <body>
 <section id="seite3">
 <bookmark xml-lang="en-US" branch="hid/HID_FAX_PAGE3" id="bm_id3147102" localize="false"/>
-<paragraph role="heading" id="hd_id3155934" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/autopi/01020300.xhp" name="Fax Wizard - Sender and Recipient">Fax Wizard - Sender and Recipient</link></paragraph>
+<paragraph role="heading" id="hd_id3155934" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/autopi/01020300.xhp" name="AutoPilot Fax - Page 3">Fax Wizard - Recipient and Sender</link></paragraph>
 <paragraph role="paragraph" id="par_id3150808" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_FAX_PAGE3">Specifies the receiver and sender information for the fax.</ahelp></paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="E" localize="false"><link href="text/shared/00/00000401.xhp#autopilotfax3"><embedvar href="text/shared/00/00000004.xhp#wie"/></link></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41140" id="bm_id2698141" localize="false"/>
-<paragraph role="heading" id="par_idN105DE" xml-lang="en-US" level="3" l10n="NEW">Use user data for return address</paragraph>
+<paragraph role="heading" id="par_idN105D7" xml-lang="en-US" level="2" l10n="NEW">Sender address</paragraph>
+<paragraph role="paragraph" id="par_idN105DB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies options for the sender address on the fax template.</ahelp></paragraph>
+<paragraph role="heading" id="par_idN105DE" xml-lang="en-US" level="3" l10n="NEW">Use placeholders for sender address</paragraph>
 <paragraph role="paragraph" id="par_idN105E2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Inserts placeholders for the address on the fax template. Later in the fax document, click the placeholder to enter the actual data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41141" id="bm_id8446302" localize="false"/>
-<paragraph role="heading" id="par_idN105E5" xml-lang="en-US" level="3" l10n="NEW">New return address</paragraph>
+<paragraph role="heading" id="par_idN105E5" xml-lang="en-US" level="3" l10n="NEW">Define sender address</paragraph>
 <paragraph role="paragraph" id="par_idN105E9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to enter the address data in the following text boxes. The data is inserted as normal text in the fax document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41142" id="bm_id5530869" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/41143" id="bm_id5629749" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/41144" id="bm_id6467787" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/41145" id="bm_id3894466" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/41146" id="bm_id5997192" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/41147" id="bm_id9666737" localize="false"/>
 <paragraph role="heading" id="par_idN105EC" xml-lang="en-US" level="4" l10n="NEW">(Address data fields)</paragraph>
 <paragraph role="paragraph" id="par_idN105EF" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the sender address data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41148" id="bm_id1582384" localize="false"/>
+<paragraph role="heading" id="par_idN105F2" xml-lang="en-US" level="2" l10n="NEW">Receiver address</paragraph>
+<paragraph role="paragraph" id="par_idN105F6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies options for the receiver address on the fax template.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN105F9" xml-lang="en-US" level="3" l10n="NEW">Use placeholders as receiver address</paragraph>
 <paragraph role="paragraph" id="par_idN105FD" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Inserts placeholders for the address on the fax template. Later in the fax document, click the placeholder to enter the actual data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41149" id="bm_id6142765" localize="false"/>
 <paragraph role="heading" id="par_idN10600" xml-lang="en-US" level="3" l10n="NEW">Use address database for mail merge</paragraph>
 <paragraph role="paragraph" id="par_idN10604" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Inserts database fields for a later mail merge with the fax document.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="CHG" oldref="21"><link href="text/shared/autopi/01020400.xhp" name="Go to Fax Wizard - Footer">Go to Fax Wizard - Footer</link></paragraph>
+<paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="CHG" oldref="21"><link href="text/shared/autopi/01020400.xhp" name="Go to AutoPilot Fax - Page 4">Go to Fax Wizard - Footer</link></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01020400.xhp b/helpcontent2/source/text/shared/autopi/01020400.xhp
index c798da2154..6943765781 100755
--- a/helpcontent2/source/text/shared/autopi/01020400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020400.xhp
@@ -1,87 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
  *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
+ *  $RCSfile: 01020400.xhp,v $
  *
- *  Sun Microsystems Inc., October, 2000
+ *  $Revision: 1.5 $
  *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  last change: $Author: obo $ $Date: 2006-03-28 13:29:16 $
  *
- *  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.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- *  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
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 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.
  *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
+ *    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
  *
  ************************************************************************-->
 	
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedautopi01020400xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Fax Wizard - Footer</title>
+<title id="tit" xml-lang="en-US">Fax Wizard - Page 4</title>
 <filename>/text/shared/autopi/01020400.xhp</filename>
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-10-31T13:35:18">UFI: edited for new Wizard
+<lastedited date="2004-09-30T14:57:32">UFI: edited for new Wizard
 YJ: checked</lastedited>
 </history>
 </meta>
 <body>
 <section id="seite4">
 <bookmark xml-lang="en-US" branch="hid/HID_FAX_PAGE4" id="bm_id3152425" localize="false"/>
-<paragraph role="heading" id="hd_id3147143" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/autopi/01020400.xhp" name="Fax Wizard - Footer">Fax Wizard - Footer</link></paragraph>
+<paragraph role="heading" id="hd_id3147143" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/autopi/01020400.xhp" name="AutoPilot Fax - Page 4">Fax Wizard - Footer</link></paragraph>
 <paragraph role="paragraph" id="par_id3155805" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_FAX_PAGE4">Specifies the footer data.</ahelp></paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="E" localize="false"><link href="text/shared/00/00000401.xhp#autopilotfax4"><embedvar href="text/shared/00/00000004.xhp#wie"/></link></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41158" id="bm_id6082033" localize="false"/>
 <paragraph role="heading" id="par_idN105D7" xml-lang="en-US" level="2" l10n="NEW">Footer</paragraph>
 <paragraph role="paragraph" id="par_idN105DB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the text to be printed in the footer area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41159" id="bm_id5789971" localize="false"/>
-<paragraph role="heading" id="par_idN105DE" xml-lang="en-US" level="3" l10n="NEW">Include only on second and following pages</paragraph>
+<paragraph role="heading" id="par_idN105DE" xml-lang="en-US" level="3" l10n="NEW">Only on second and following pages</paragraph>
 <paragraph role="paragraph" id="par_idN105E1" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Suppresses the footer on the first page of a multipage fax document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41160" id="bm_id2247077" localize="false"/>
 <paragraph role="heading" id="par_idN105E4" xml-lang="en-US" level="3" l10n="NEW">Include page number</paragraph>
 <paragraph role="paragraph" id="par_idN105E7" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Prints a page number in the footer area.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3152812" xml-lang="en-US" l10n="CHG" oldref="19"><link href="text/shared/autopi/01020500.xhp" name="Go to Fax Wizard - Name and location">Go to Fax Wizard - Name and location</link></paragraph>
+<paragraph role="paragraph" id="par_id3152812" xml-lang="en-US" l10n="CHG" oldref="19"><link href="text/shared/autopi/01020500.xhp" name="Go to AutoPilot Fax - Page 5">Go to Fax Wizard - Name and location</link></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01020500.xhp b/helpcontent2/source/text/shared/autopi/01020500.xhp
index 59a56bdd1d..68db62d26d 100755
--- a/helpcontent2/source/text/shared/autopi/01020500.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020500.xhp
@@ -1,90 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
  *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
+ *  $RCSfile: 01020500.xhp,v $
  *
- *  Sun Microsystems Inc., October, 2000
+ *  $Revision: 1.5 $
  *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  last change: $Author: obo $ $Date: 2006-03-28 13:29:16 $
  *
- *  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.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- *  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
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 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.
  *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
+ *    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
  *
  ************************************************************************-->
 	
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedautopi01020500xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Fax Wizard - Name and location</title>
+<title id="tit" xml-lang="en-US">Fax Wizard - Page 5</title>
 <filename>/text/shared/autopi/01020500.xhp</filename>
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-10-31T13:38:19">UFI: edited for new Wizard
+<lastedited date="2004-09-30T14:58:49">UFI: edited for new Wizard
 YJ: checked</lastedited>
 </history>
 </meta>
 <body>
 <section id="seite5">
 <bookmark xml-lang="en-US" branch="hid/HID_FAX_PAGE5" id="bm_id3156027" localize="false"/>
-<paragraph role="heading" id="hd_id3150247" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/autopi/01020500.xhp" name="Fax Wizard - Name and location">Fax Wizard - Name and location</link></paragraph>
+<paragraph role="heading" id="hd_id3150247" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/autopi/01020500.xhp" name="AutoPilot Fax - Page 5">Fax Wizard - Name and Location</link></paragraph>
 <paragraph role="paragraph" id="par_id3155552" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_FAX_PAGE5">Defines the template name and location.</ahelp></paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3147043" xml-lang="en-US" l10n="E" localize="false"><link href="text/shared/00/00000401.xhp#autopilotfax5"><embedvar href="text/shared/00/00000004.xhp#wie"/></link></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41163" id="bm_id1817377" localize="false"/>
 <paragraph role="heading" id="par_idN105D7" xml-lang="en-US" level="2" l10n="NEW">Template name</paragraph>
 <paragraph role="paragraph" id="par_idN105DB" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the name of the fax template.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41167" id="bm_id7602160" localize="false"/>
-<paragraph role="heading" id="par_idN105DE" xml-lang="en-US" level="2" l10n="NEW">...</paragraph>
-<paragraph role="paragraph" id="par_idN105E2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to enter or select the complete path, including the file name of the fax template.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41165" id="bm_id1115451" localize="false"/>
-<paragraph role="heading" id="par_idN105E5" xml-lang="en-US" level="3" l10n="NEW">Create a fax from this template</paragraph>
+<paragraph role="heading" id="par_idN105DE" xml-lang="en-US" level="2" l10n="NEW">Path</paragraph>
+<paragraph role="paragraph" id="par_idN105E2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter or select the complete path, including the file name of the fax template.</ahelp></paragraph>
+<paragraph role="heading" id="par_idN105E5" xml-lang="en-US" level="3" l10n="NEW">Create a fax out of this template</paragraph>
 <paragraph role="paragraph" id="par_idN105E9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Creates and saves the fax template, then opens a new fax document based on that template.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/41166" id="bm_id2092349" localize="false"/>
 <paragraph role="heading" id="par_idN105EC" xml-lang="en-US" level="3" l10n="NEW">Make manual changes to this fax template</paragraph>
 <paragraph role="paragraph" id="par_idN105F0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Creates and saves the fax template, then opens the template for further editing.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3151119" xml-lang="en-US" l10n="CHG" oldref="35"><link href="text/shared/autopi/01020000.xhp" name="Go to Fax Wizard">Go to Fax Wizard</link></paragraph>
+<paragraph role="paragraph" id="par_id3151119" xml-lang="en-US" l10n="CHG" oldref="35"><link href="text/shared/autopi/01020000.xhp" name="Go to AutoPilot Fax">Go to Fax Wizard</link></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01130000.xhp b/helpcontent2/source/text/shared/autopi/01130000.xhp
index 944af89a58..1463448d44 100755
--- a/helpcontent2/source/text/shared/autopi/01130000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01130000.xhp
@@ -1,56 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
  *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
+ *  $RCSfile: 01130000.xhp,v $
  *
- *  Sun Microsystems Inc., October, 2000
+ *  $Revision: 1.8 $
  *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  last change: $Author: obo $ $Date: 2006-03-28 13:29:16 $
  *
- *  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.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- *  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
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 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.
  *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
+ *    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
  *
  ************************************************************************-->
 	
@@ -62,11 +42,21 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-11-21T15:37:59">converted from old format - fpe
+<lastedited date="2005-04-18T16:38:08">converted from old format - fpe
 checked - yj</lastedited>
 </history>
 </meta>
 <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3151097"><bookmark_value>wizards; Microsoft import</bookmark_value>
+<bookmark_value>Microsoft Office; wizard to import files</bookmark_value>
+<bookmark_value>file import</bookmark_value>
+<bookmark_value>importing; Microsoft document wizard</bookmark_value>
+<bookmark_value>XML converters</bookmark_value>
+<bookmark_value>converters; XML</bookmark_value>
+<bookmark_value>wizards; XML converters</bookmark_value>
+<bookmark_value>Document Converter Wizard</bookmark_value>
+<bookmark_value>wizards; document converter</bookmark_value>
+</bookmark>
 <paragraph role="paragraph" id="par_id3151097" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDHELP" id="bm_id3154751" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/macro:///ImportWizard.Main.Main" id="bm_id4087038" localize="false"/>
diff --git a/helpcontent2/source/text/shared/autopi/01170000.xhp b/helpcontent2/source/text/shared/autopi/01170000.xhp
index 6fa036b9c4..15ed02d537 100755
--- a/helpcontent2/source/text/shared/autopi/01170000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170000.xhp
@@ -1,56 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
  *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
+ *  $RCSfile: 01170000.xhp,v $
  *
- *  Sun Microsystems Inc., October, 2000
+ *  $Revision: 1.7 $
  *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  last change: $Author: obo $ $Date: 2006-03-28 13:29:16 $
  *
- *  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.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- *  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
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 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.
  *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
+ *    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
  *
  ************************************************************************-->
 	
@@ -62,7 +42,7 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-11-14T11:39:00">UFI: added and changed Help-IDs to fix #112444#</lastedited>
+<lastedited date="2005-07-05T10:40:15">UFI: added and changed Help-IDs to fix #112444#</lastedited>
 </history>
 </meta>
 <body>
@@ -81,9 +61,6 @@
 <bookmark xml-lang="en-US" branch="hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK" id="bm_id3149096" localize="false"/>
 <paragraph role="heading" id="hd_id3154288" xml-lang="en-US" level="3" l10n="U" oldref="10">Mozilla / Netscape</paragraph>
 <paragraph role="paragraph" id="par_id3145071" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK">Select this option if you already use an address book in Mozilla or Netscape.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION" id="bm_id7841731" localize="false"/>
-<paragraph role="heading" id="hd_id5507980" xml-lang="en-US" level="3" l10n="NEW">Thunderbird</paragraph>
-<paragraph role="paragraph" id="par_id7853022" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this option if you already use an address book in Thunderbird.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_LDAP" id="bm_id3147654" localize="false"/>
 <paragraph role="heading" id="hd_id3149182" xml-lang="en-US" level="3" l10n="U" oldref="12">LDAP address data</paragraph>
 <paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_LDAP">Select this option if you already have address data on an LDAP server.</ahelp></paragraph>
@@ -98,7 +75,6 @@
 <paragraph role="paragraph" id="par_id3150254" xml-lang="en-US" l10n="U" oldref="17"><switchinline select="sys"><caseinline select="WIN"><ahelp hid="extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOKEXPRESS">Select this option if you already use an address book in Microsoft Outlook Express.</ahelp>
 </caseinline></switchinline></paragraph>
 <bookmark xml-lang="en-US" branch="hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OTHER" id="bm_id3159148" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/860619271" id="bm_id4760887" localize="false"/>
 <paragraph role="heading" id="hd_id3150976" xml-lang="en-US" level="3" l10n="U" oldref="18">Other external data source</paragraph>
 <paragraph role="paragraph" id="par_id3156192" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OTHER">Select this option if you want to register another data source as address book in $[officename].</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_CANCEL" id="bm_id3150771" localize="false"/>