INTEGRATION: CWS hc680fin (1.4.12); FILE MERGED

2006/01/05 13:36:24 ufi 1.4.12.2: RESYNC: (1.4-1.5); FILE MERGED
2005/11/03 12:38:40 ufi 1.4.12.1: *** empty log message ***

1 files changed, 49 insertions, 27 deletions

diff --git a/helpcontent2/source/text/shared/autopi/01020000.xhp b/helpcontent2/source/text/shared/autopi/01020000.xhp
index 2106b27889..2da364dd5b 100644
--- a/helpcontent2/source/text/shared/autopi/01020000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020000.xhp
@@ -1,36 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
  *
- *  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: 01020000.xhp,v $
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
  *
- *  $Revision: 1.5 $
+ *  Sun Microsystems Inc., October, 2000
  *
- *  last change: $Author: rt $ $Date: 2005-10-21 16:10:52 $
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ *  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.
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  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 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.
+ *  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): _______________________________________
  *
- *    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
  *
  ************************************************************************-->
 	
@@ -42,7 +62,7 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-15T11:00:30">UFI: edited to suit new Wizard
+<lastedited date="2005-10-31T13:17:34">UFI: edited to suit new Wizard
 YJ: checked</lastedited>
 </history>
 </meta>
@@ -65,13 +85,15 @@ 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">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="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="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">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="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="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">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>
+<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"/>
 </body>
 </helpdocument>