CWS-TOOLING: integrate CWS hcshared19

13 files changed, 240 insertions, 200 deletions

diff --git a/helpcontent2/source/text/shared/autopi/01010000.xhp b/helpcontent2/source/text/shared/autopi/01010000.xhp
index 2f7abebf88..32930bf472 100644
--- a/helpcontent2/source/text/shared/autopi/01010000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01010000.xhp
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
@@ -12,7 +11,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: 01010000.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -33,11 +32,10 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsharedautopi01010000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01010000xml" indexer="include">
 <title id="tit" xml-lang="en-US">Letter Wizard</title>
 <filename>/text/shared/autopi/01010000.xhp</filename>
 </topic>
@@ -48,11 +46,12 @@
 <bookmark_value>templates;letters</bookmark_value>
 </bookmark><comment>mw made "letters;..." a one level entry</comment>
 <bookmark xml-lang="en-US" branch="hid/.uno:AutoPilotLetter" id="bm_id3157898" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/service:com.sun.star.wizards.letter.CallWizard?start" id="bm_id6131473" localize="false"/><paragraph role="heading" id="hd_id3151100" xml-lang="en-US" level="1" l10n="U" oldref="1">Letter Wizard</paragraph>
+<bookmark xml-lang="en-US" branch="hid/service:com.sun.star.wizards.letter.CallWizard?start" id="bm_id6131473" localize="false"/>
+<paragraph role="heading" id="hd_id3151100" xml-lang="en-US" level="1" l10n="U" oldref="1">Letter Wizard</paragraph>
 <paragraph role="paragraph" id="par_id3093440" xml-lang="en-US" l10n="U" oldref="2"><variable id="brief"><ahelp hid=".uno:AutoPilotLetter">Starts the wizard for a letter template.</ahelp>
 </variable> You can use this template for both business and personal correspondence.</paragraph>
 <section id="howtoget">
-  <embed href="text/shared/00/00000401.xhp#autopilotbrief"/>
+<embed href="text/shared/00/00000401.xhp#autopilotbrief"/>
 </section>
 <paragraph role="paragraph" id="par_id3149178" xml-lang="en-US" l10n="U" oldref="3">$[officename] comes with sample templates for personal or business letters, which you can customize to your own needs with the help of the wizard. The wizard leads you step-by-step in creating a document template and offers numerous layout and design options. The preview gives you an impression of how the finished letter will appear according to the settings you choose.</paragraph>
 <paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="4">Within the wizard, you can modify your entries and options at any time. You may also skip an entire page or even all the wizard pages, in which case the current (or default) settings will remain in effect.</paragraph>
@@ -64,15 +63,23 @@
 <embed href="text/shared/autopi/01010500.xhp#seite5"/>
 <embed href="text/shared/autopi/01010600.xhp#seite6"/>
 <section id="zurueck">
-<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD_BACK" id="bm_id264595" localize="false"/><paragraph role="heading" id="hd_id3159176" xml-lang="en-US" level="2" l10n="U" oldref="6">Back</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD_BACK" id="bm_id264595" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_PREVIOUS" id="bm_id3156024" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDPREV" id="bm_id3156347" localize="false"/>
+<paragraph role="heading" id="hd_id3159176" xml-lang="en-US" level="2" l10n="U" oldref="6">Back</paragraph>
 <paragraph role="paragraph" id="par_id3153543" xml-lang="en-US" l10n="CHG" oldref="7"><ahelp hid="HID_LTRWIZARD_BACK">Allows you to view the selections that you made on the previous steps.</ahelp> The current settings will be saved. </paragraph>
 </section>
 <section id="weiter">
-<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD_NEXT" id="bm_id6038392" localize="false"/><paragraph role="heading" id="hd_id3150254" xml-lang="en-US" level="2" l10n="U" oldref="8">Next</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD_NEXT" id="bm_id6038392" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_NEXT" id="bm_id3154346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDNEXT" id="bm_id3145382" localize="false"/>
+<paragraph role="heading" id="hd_id3150254" xml-lang="en-US" level="2" l10n="U" oldref="8">Next</paragraph>
 <paragraph role="paragraph" id="par_id3155923" xml-lang="en-US" l10n="CHG" oldref="9"><ahelp hid="HID_LTRWIZARD_NEXT">Saves the current settings and continues to the next page.</ahelp></paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD_CREATE" id="bm_id2346873" localize="false"/><paragraph role="heading" id="hd_id3148944" xml-lang="en-US" level="2" l10n="CHG" oldref="10">Finish</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD_CREATE" id="bm_id2346873" localize="false"/>
+<paragraph role="heading" id="hd_id3148944" xml-lang="en-US" level="2" l10n="CHG" oldref="10">Finish</paragraph>
 <paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="HID_LTRWIZARD_CREATE">According to your selections, the wizard creates a new document template and saves it on your hard disk.</ahelp> $[officename] creates a new document based on the existing templates with the "Untitled X" name (X stands for the consecutive numbering) and displays it on the work area.</paragraph>
 <paragraph role="note" id="par_id3144433" xml-lang="en-US" l10n="U" oldref="16">$[officename] saves the current settings in the wizard according to the chosen template. These settings are used as the default settings the next time you activate the wizard.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD" id="bm_id9510177" localize="false"/></body>
+<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD" id="bm_id9510177" localize="false"/>
+</body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01020000.xhp b/helpcontent2/source/text/shared/autopi/01020000.xhp
index c69724477d..86ef883c14 100644
--- a/helpcontent2/source/text/shared/autopi/01020000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020000.xhp
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
@@ -12,7 +11,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: 01020000.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -33,11 +32,10 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsharedautopi01020000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01020000xml" indexer="include">
 <title id="tit" xml-lang="en-US">Fax Wizard</title>
 <filename>/text/shared/autopi/01020000.xhp</filename>
 </topic>
@@ -48,11 +46,12 @@
 <bookmark_value>templates;faxes</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/.uno:AutoPilotFax" id="bm_id3143281" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/service:com.sun.star.wizards.fax.CallWizard?start" id="bm_id559709" localize="false"/><paragraph role="heading" id="hd_id3150445" xml-lang="en-US" level="1" l10n="U" oldref="1">Fax Wizard</paragraph>
+<bookmark xml-lang="en-US" branch="hid/service:com.sun.star.wizards.fax.CallWizard?start" id="bm_id559709" localize="false"/>
+<paragraph role="heading" id="hd_id3150445" xml-lang="en-US" level="1" l10n="U" oldref="1">Fax Wizard</paragraph>
 <paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="fax"><ahelp hid=".uno:AutoPilotFax">Opens the wizard for faxes.</ahelp> The wizard can help you create document templates for fax documents. You can then print the fax documents to a printer or to a fax machine, if fax driver software is available. 
 </variable></paragraph>
 <section id="howtoget">
-  <embed href="text/shared/00/00000401.xhp#autopilotfax"/>
+<embed href="text/shared/00/00000401.xhp#autopilotfax"/>
 </section>
 <paragraph role="paragraph" id="par_id3154824" xml-lang="en-US" l10n="CHG" oldref="3">$[officename] comes with a template for fax documents, which you can modify with the wizard to suit your own needs. The wizard leads you step-by-step in creating a document template, and offers numerous layout and design options. The document preview gives you an impression of how the finished fax will appear.</paragraph>
 <paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="4">Within the dialog you can modify your entries and options at any time. You can also skip an entire page or even all the wizard pages, in which case the current (or default) settings will remain in effect.</paragraph>
@@ -61,12 +60,16 @@
 <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>
+<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="heading" id="hd_id3147335" xml-lang="en-US" level="2" l10n="U" oldref="7">Next</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"><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>
+<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"><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"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD" id="bm_id4632404" localize="false"/><comment>Dialog ID must be below any &lt;avis&gt; tag</comment></body>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD" id="bm_id4632404" localize="false"/><comment>Dialog ID must be below any &lt;avis&gt; tag</comment>
+</body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01090000.xhp b/helpcontent2/source/text/shared/autopi/01090000.xhp
index a6771245f8..a8f6b09f17 100755
--- a/helpcontent2/source/text/shared/autopi/01090000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090000.xhp
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
@@ -11,7 +11,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: 01090000.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,17 +32,13 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsharedautopi01090000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01090000xml" indexer="include">
 <title id="tit" xml-lang="en-US">Form Wizard</title>
 <filename>/text/shared/autopi/01090000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-14T12:46:21">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_DIALOG" id="bm_id3156211" localize="false"/>
@@ -53,7 +49,7 @@
 <paragraph role="paragraph" id="par_id3150247" xml-lang="en-US" l10n="U" oldref="2"><variable id="formular"><ahelp hid="HID_DLGFORM_DIALOG">Activates the Wizard for creating forms.</ahelp>
 </variable></paragraph>
 <section id="howtoget">
-  <embed href="text/shared/00/00000401.xhp#autopilotformular"/>
+<embed href="text/shared/00/00000401.xhp#autopilotformular"/>
 </section>
 <paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="U" oldref="3">Select the form properties using the following steps:</paragraph>
 <embed href="text/shared/autopi/01090100.xhp#fieldselection"/>
@@ -64,10 +60,10 @@
 <embed href="text/shared/autopi/01090400.xhp#setdataentry"/>
 <embed href="text/shared/autopi/01090500.xhp#applystyles"/>
 <embed href="text/shared/autopi/01090600.xhp#setname"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDPREV" id="bm_id3145346" localize="false"/><embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDNEXT" id="bm_id3147576" localize="false"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/>
+<embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+<embed href="text/shared/00/00000001.xhp#weiterautopi"/>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDFINISH" id="bm_id6868800" localize="false"/>
 <paragraph role="paragraph" id="par_idN10686" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to create the form without answering further pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDCANCEL" id="bm_id3149177" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01090100.xhp b/helpcontent2/source/text/shared/autopi/01090100.xhp
index 20604181db..92c026a80a 100755
--- a/helpcontent2/source/text/shared/autopi/01090100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090100.xhp
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
@@ -12,7 +11,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: 01090100.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -33,11 +32,10 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsharedautopi01090100xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01090100xml" indexer="include">
 <title id="tit" xml-lang="en-US">Form Wizard - Field Selection</title>
 <filename>/text/shared/autopi/01090100.xhp</filename>
 </topic>
@@ -48,51 +46,90 @@
 <paragraph role="paragraph" id="par_id3150445" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">On this page of the <link href="text/shared/autopi/01090000.xhp">Form Wizard</link>, you can specify the table or query that you need to create the form as well as the fields that you want to include in the form.</ahelp></paragraph>
 </section>
 <section id="howtoget">
-  <embed href="text/shared/00/00000401.xhp#autopilotformular"/>
+<embed href="text/shared/00/00000401.xhp#autopilotformular"/>
 </section>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_LBTABLES" id="bm_id3154751" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_LBTABLES" id="bm_id4652241" localize="false"/><paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Tables or queries</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_LBTABLES" id="bm_id4652241" localize="false"/>
+<paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Tables or queries</paragraph>
 <paragraph role="paragraph" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_DLGFORM_LBTABLES">Specifies the table or query that you want to create the form for.</ahelp></paragraph>
 <section id="vorhandenefelder">
 <bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_FIELDSAVAILABLE" id="bm_id3149177" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_FIELDSAVAILABLE" id="bm_id3552354" localize="false"/><paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="2" l10n="CHG" oldref="8">Available fields</paragraph>
-<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_DLGFORM_FIELDSAVAILABLE">Lists the names of the data base fields in the selected table or query.</ahelp> Click to select a field or hold down the Shift or the <switchinline select="sys"><caseinline select="MAC">Command 
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while you click to select more than one field.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_FIELDSAVAILABLE" id="bm_id3552354" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_FIELDSAVAILABLE" id="bm_id560014" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFILTERFIELDS" id="bm_id2533341" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFIELDS" id="bm_id4751121" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_FIELDSAVAILABLE" id="bm_id4880825" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBP_LISTBOX_RID_PAGE_GW_FIELDSELECTION_LB_EXISTING_FIELDS" id="bm_id3149283" localize="false"/>
+<paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="2" l10n="CHG" oldref="8">Available fields</paragraph>
+<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_DLGFORM_FIELDSAVAILABLE">Lists the names of the data base fields in the selected table or query.</ahelp> Click to select a field or hold down the Shift or the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while you click to select more than one field.</paragraph>
 </section>
 <section id="uebernehmen">
 <bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDMOVESELECTED" id="bm_id3152996" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDMOVESELECTED" id="bm_id5681936" localize="false"/><paragraph role="heading" id="hd_id3150443" xml-lang="en-US" level="2" l10n="U" oldref="10">&gt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDMOVESELECTED" id="bm_id5681936" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVESELECTED" id="bm_id5441755" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDFILTERMOVESELECTED" id="bm_id4933927" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVESELECTED" id="bm_id9028595" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVESELECTED" id="bm_id2095095" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_FIELDRIGHT" id="bm_id3159201" localize="false"/>
+<paragraph role="heading" id="hd_id3150443" xml-lang="en-US" level="2" l10n="U" oldref="10">&gt;</paragraph>
 <paragraph role="paragraph" id="par_id3148538" xml-lang="en-US" l10n="CHG" oldref="11"><ahelp hid="HID_DLGFORM_CMDMOVESELECTED">Click to move the selected field(s) to the box that the arrow is pointing to.</ahelp><comment>i73704</comment></paragraph>
 </section>
 <section id="uebernehmealle">
 <bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDMOVEALL" id="bm_id3156326" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDMOVEALL" id="bm_id990325" localize="false"/><paragraph role="heading" id="hd_id3154142" xml-lang="en-US" level="2" l10n="U" oldref="12">&gt;&gt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDMOVEALL" id="bm_id990325" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVEALL" id="bm_id6911221" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEALL" id="bm_id3862117" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVEALL" id="bm_id3775444" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSRIGHT" id="bm_id3150178" localize="false"/>
+<paragraph role="heading" id="hd_id3154142" xml-lang="en-US" level="2" l10n="U" oldref="12">&gt;&gt;</paragraph>
 <paragraph role="paragraph" id="par_id3145121" xml-lang="en-US" l10n="CHG" oldref="13"><ahelp hid="HID_DLGFORM_CMDMOVEALL">Click to move all fields to the box that the arrow is pointing to.</ahelp></paragraph>
 </section>
 <section id="entfernen">
 <bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDREMOVESELECTED" id="bm_id3150669" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDREMOVESELECTED" id="bm_id9349345" localize="false"/><paragraph role="heading" id="hd_id3155419" xml-lang="en-US" level="2" l10n="U" oldref="14">&lt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDREMOVESELECTED" id="bm_id9349345" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDREMOVESELECTED" id="bm_id3583483" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDFILTERREMOVESELECTED" id="bm_id9915768" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDREMOVESELECTED" id="bm_id2427442" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDREMOVESELECTED" id="bm_id7336649" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_FIELDLEFT" id="bm_id3147043" localize="false"/>
+<paragraph role="heading" id="hd_id3155419" xml-lang="en-US" level="2" l10n="U" oldref="14">&lt;</paragraph>
 <paragraph role="paragraph" id="par_id3149763" xml-lang="en-US" l10n="CHG" oldref="15"><ahelp hid="HID_DLGFORM_CMDREMOVESELECTED">Click to move the selected field(s) to the box that the arrow is pointing to.</ahelp></paragraph>
 </section>
 <section id="entfernealle">
 <bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDREMOVEALL" id="bm_id3155135" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDREMOVEALL" id="bm_id1483504" localize="false"/><paragraph role="heading" id="hd_id3159399" xml-lang="en-US" level="2" l10n="U" oldref="16">&lt;&lt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDREMOVEALL" id="bm_id1483504" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDREMOVEALL" id="bm_id86672" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDREMOVEALL" id="bm_id9287697" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDREMOVEALL" id="bm_id4853053" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSLEFT" id="bm_id3156136" localize="false"/>
+<paragraph role="heading" id="hd_id3159399" xml-lang="en-US" level="2" l10n="U" oldref="16">&lt;&lt;</paragraph>
 <paragraph role="paragraph" id="par_id3156329" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="HID_DLGFORM_CMDREMOVEALL">Click to move all fields to the box that the arrow is pointing to.</ahelp></paragraph>
 </section>
 <section id="updown">
 <bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDMOVEUP" id="bm_id3334452" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID2_BTN_DOC_UP" id="bm_id915860" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVEUP" id="bm_id5749382" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEUP" id="bm_id710776" localize="false"/><paragraph role="heading" id="par_idN1074A" xml-lang="en-US" level="2" l10n="NEW">^</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEUP" id="bm_id710776" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVEUP_PK_SELECTED" id="bm_id2638019" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDFILTERMOVEUP" id="bm_id1707815" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEUP" id="bm_id3135166" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVEUP" id="bm_id3982360" localize="false"/>
+<paragraph role="heading" id="par_idN1074A" xml-lang="en-US" level="2" l10n="NEW">^</paragraph>
 <paragraph role="paragraph" id="par_idN1074E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to move the selected field up one entry in the list.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDMOVEDOWN" id="bm_id5430463" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID2_BTN_DOC_DOWN" id="bm_id2385937" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVEDOWN" id="bm_id1741691" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEDOWN" id="bm_id632038" localize="false"/><paragraph role="heading" id="par_idN10751" xml-lang="en-US" level="2" l10n="NEW">v</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEDOWN" id="bm_id632038" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED" id="bm_id6198309" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDFILTERMOVEDOWN" id="bm_id6916714" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEDOWN" id="bm_id5736259" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVEDOWN" id="bm_id2286751" localize="false"/>
+<paragraph role="heading" id="par_idN10751" xml-lang="en-US" level="2" l10n="NEW">v</paragraph>
 <paragraph role="paragraph" id="par_idN10755" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to move the selected field down one entry in the list.</ahelp></paragraph>
 </section>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_FIELDSSELECTED" id="bm_id3145673" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_FIELDSSELECTED" id="bm_id2010864" localize="false"/><paragraph role="heading" id="hd_id3147618" xml-lang="en-US" level="2" l10n="CHG" oldref="18">Fields in the form</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_FIELDSSELECTED" id="bm_id2010864" localize="false"/>
+<paragraph role="heading" id="hd_id3147618" xml-lang="en-US" level="2" l10n="CHG" oldref="18">Fields in the form</paragraph>
 <paragraph role="paragraph" id="par_id3156194" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="HID_DLGFORM_FIELDSSELECTED">Displays the fields that are in the new form.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3150398" xml-lang="en-US" l10n="CHG" oldref="7"><link href="text/shared/autopi/01090200.xhp" name="Form Wizard - Set up a subform">Form Wizard - Set up a subform</link></paragraph>
 </body>
diff --git a/helpcontent2/source/text/shared/autopi/01090210.xhp b/helpcontent2/source/text/shared/autopi/01090210.xhp
index f5d5997cfc..88f9e1b00e 100755
--- a/helpcontent2/source/text/shared/autopi/01090210.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090210.xhp
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
@@ -10,7 +11,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: 01090210.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -29,18 +30,15 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************-->
+ ************************************************************************
+ -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsharedautopi01090210xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01090210xml" indexer="include">
 <title id="tit" xml-lang="en-US">Form Wizard - Add Subform Fields</title>
 <filename>/text/shared/autopi/01090210.xhp</filename>
 </topic>
-<history>
-<created date="2004-07-02T12:24:48">UFI: new Form Wizard page 3</created>
-<lastedited date="2005-02-15T14:51:39">YJ: checked</lastedited>
-</history>
 </meta>
 <body>
 <section id="addsubformfields">
@@ -48,18 +46,17 @@
 <paragraph role="paragraph" id="par_idN10556" xml-lang="en-US" l10n="NEW">Specify the table or query you need to create the subform, and which fields you wish to include in the subform.</paragraph>
 </section>
 <section id="howtoget">
-  <embed href="text/shared/00/00000401.xhp#autopilotformular"/>
+<embed href="text/shared/00/00000401.xhp#autopilotformular"/>
 </section>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_LBTABLES" id="bm_id2198553" localize="false"/>
 <paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2" l10n="NEW">Tables or queries</paragraph>
 <paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the table or query for which the subform is to be created.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_FIELDSAVAILABLE" id="bm_id4880825" localize="false"/><embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVESELECTED" id="bm_id2095095" localize="false"/><embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVEALL" id="bm_id3775444" localize="false"/><embed href="text/shared/autopi/01090100.xhp#uebernehmealle"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDREMOVESELECTED" id="bm_id7336649" localize="false"/><embed href="text/shared/autopi/01090100.xhp#entfernen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDREMOVEALL" id="bm_id4853053" localize="false"/><embed href="text/shared/autopi/01090100.xhp#entfernealle"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVEUP" id="bm_id3982360" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVEDOWN" id="bm_id2286751" localize="false"/><embed href="text/shared/autopi/01090100.xhp#updown"/>
+<embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
+<embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
+<embed href="text/shared/autopi/01090100.xhp#uebernehmealle"/>
+<embed href="text/shared/autopi/01090100.xhp#entfernen"/>
+<embed href="text/shared/autopi/01090100.xhp#entfernealle"/>
+<embed href="text/shared/autopi/01090100.xhp#updown"/>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_FIELDSSELECTED" id="bm_id7471541" localize="false"/>
 <paragraph role="heading" id="par_idN10590" xml-lang="en-US" level="2" l10n="NEW">Fields in my subform</paragraph>
 <paragraph role="paragraph" id="par_idN10594" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays all fields that will be included in the new subform.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01100000.xhp b/helpcontent2/source/text/shared/autopi/01100000.xhp
index 29a986805b..d98e06c15c 100755
--- a/helpcontent2/source/text/shared/autopi/01100000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01100000.xhp
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
@@ -11,7 +11,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: 01100000.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,17 +32,13 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsharedautopi01100000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01100000xml" indexer="include">
 <title id="tit" xml-lang="en-US">Report Wizard</title>
 <filename>/text/shared/autopi/01100000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-04-12T12:49:21">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="hid/HID_DOCUMENT_CREATE_REPWIZ" id="bm_id3153894" localize="false"/>
@@ -50,7 +46,7 @@
 <paragraph role="paragraph" id="par_id3145071" xml-lang="en-US" l10n="U" oldref="1"><variable id="report"><ahelp hid="HID_DOCUMENT_CREATE_REPWIZ">Activates the wizard for creating reports.</ahelp>
 </variable></paragraph>
 <section id="howtoget">
-  <embed href="text/shared/00/00000401.xhp#autopilotreport"/>
+<embed href="text/shared/00/00000401.xhp#autopilotreport"/>
 </section>
 <embed href="text/shared/guide/data_report.xhp#data_report"/><comment>UFI: added Help ID, see #i61571</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_DIALOG" id="bm_id6317331" localize="false"/>
@@ -61,8 +57,8 @@
 <embed href="text/shared/autopi/01100300.xhp#sortoptions"/>
 <embed href="text/shared/autopi/01100400.xhp#chooselayout"/>
 <embed href="text/shared/autopi/01100500.xhp#savereport"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_0_CMDCANCEL" id="bm_id3154142" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_0_CMDPREV" id="bm_id3150984" localize="false"/><embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_0_CMDNEXTORREADY" id="bm_id3154860" localize="false"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+<embed href="text/shared/00/00000001.xhp#weiterautopi"/>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01100100.xhp b/helpcontent2/source/text/shared/autopi/01100100.xhp
index d4dfd28038..0dfe78a897 100755
--- a/helpcontent2/source/text/shared/autopi/01100100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01100100.xhp
@@ -12,7 +12,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: 01100100.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -54,8 +54,7 @@
 <paragraph role="paragraph" id="par_id3147043" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="HID_DLGREPORT_1_LBTABLES">Select the table or query for which the report is to be created.</ahelp></paragraph>
 <section id="vorhandenefelder">
 <bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_1_FIELDSAVAILABLE" id="bm_id3153683" localize="false"/><paragraph role="heading" id="hd_id3147008" xml-lang="en-US" level="2" l10n="CHG" oldref="6">Available fields</paragraph>
-<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_DLGREPORT_1_FIELDSAVAILABLE">Displays the names of the data base fields in the selected table or query.</ahelp> Click to select a field or press the Shift or <switchinline select="sys"><caseinline select="MAC">Command 
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while clicking to select multiple fields.</paragraph>
+<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_DLGREPORT_1_FIELDSAVAILABLE">Displays the names of the data base fields in the selected table or query.</ahelp> Click to select a field or press the Shift or <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while clicking to select multiple fields.</paragraph>
 </section>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_1_FIELDSSELECTED" id="bm_id3151110" localize="false"/><paragraph role="heading" id="hd_id3153031" xml-lang="en-US" level="2" l10n="U" oldref="8">Fields in report</paragraph>
 <paragraph role="paragraph" id="par_id3147275" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_DLGREPORT_1_FIELDSSELECTED">Displays all fields that are included in the new report.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01120000.xhp b/helpcontent2/source/text/shared/autopi/01120000.xhp
index 9caf5f7a5a..ecb34db2fb 100755
--- a/helpcontent2/source/text/shared/autopi/01120000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01120000.xhp
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+	
+<!--
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
@@ -10,7 +11,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: 01120000.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -29,34 +30,34 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************
+ -->
+ 
+	
 <meta>
-<topic id="textsharedautopi01120000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Group Element Wizard</title>
+<topic id="textsharedautopi01120000xml" indexer="include">
+<title id="tit" xml-lang="en-US">Group Element Wizard</title>
 <filename>/text/shared/autopi/01120000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
-  
-  
-  <paragraph role="heading" level="1" id="hd_id3149031" l10n="U" xml-lang="en-US" oldref="1">Group Element Wizard</paragraph>
-  <paragraph xml-lang="en-US" role="paragraph" id="par_id3151097" l10n="U" oldref="2">The Group Element Wizard starts automatically when you insert a <link href="text/shared/02/01170000.xhp" name="Group Box">Group Box</link> into a document.</paragraph>
-  <section id="howtoget">
-  <embed href="text/shared/00/00000401.xhp#gruppen"/>
+<paragraph role="heading" id="hd_id3149031" xml-lang="en-US" level="1" l10n="U" oldref="1">Group Element Wizard</paragraph>
+<paragraph role="paragraph" id="par_id3151097" xml-lang="en-US" l10n="U" oldref="2">The Group Element Wizard starts automatically when you insert a <link href="text/shared/02/01170000.xhp" name="Group Box">Group Box</link> into a document.</paragraph>
+<section id="howtoget">
+<embed href="text/shared/00/00000401.xhp#gruppen"/>
 </section>
-  <embed href="text/shared/autopi/01120100.xhp#seite1"/>
-  <embed href="text/shared/autopi/01120200.xhp#seite2"/>
-  <embed href="text/shared/autopi/01120300.xhp#seite3"/>
-  <embed href="text/shared/autopi/01120400.xhp#seite4"/>
-  <embed href="text/shared/autopi/01120500.xhp#seite5"/>
-  <bookmark branch="hid/HID_GROUPWIZARD_CANCEL" xml-lang="en-US" id="bm_id3149183"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
-  <bookmark branch="hid/HID_GROUPWIZARD_PREVIOUS" xml-lang="en-US" id="bm_id3154318"/><embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
-  <bookmark branch="hid/HID_GROUPWIZARD_NEXT" xml-lang="en-US" id="bm_id3149095"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/>
-  <bookmark branch="hid/HID_GROUPWIZARD_FINISH" xml-lang="en-US" id="bm_id3155941"/><bookmark branch="hid/HID_GRIDWIZARD_FINISH" xml-lang="en-US" id="bm_id3155391"/><bookmark branch="hid/HID_LISTWIZARD_FINISH" xml-lang="en-US" id="bm_id3153748"/><paragraph role="heading" level="2" id="hd_id3145071" l10n="U" xml-lang="en-US" oldref="5">Create</paragraph>
-  <paragraph l10n="U" role="paragraph" id="par_id3149811" xml-lang="en-US" oldref="6"><ahelp hid="HID_LISTWIZARD_FINISH" visibility="visible">Creates the object.</ahelp></paragraph>
- </body>
+<embed href="text/shared/autopi/01120100.xhp#seite1"/>
+<embed href="text/shared/autopi/01120200.xhp#seite2"/>
+<embed href="text/shared/autopi/01120300.xhp#seite3"/>
+<embed href="text/shared/autopi/01120400.xhp#seite4"/>
+<embed href="text/shared/autopi/01120500.xhp#seite5"/>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+<embed href="text/shared/00/00000001.xhp#weiterautopi"/>
+<bookmark xml-lang="en-US" branch="hid/HID_GROUPWIZARD_FINISH" id="bm_id3155941" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_GRIDWIZARD_FINISH" id="bm_id3155391" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_LISTWIZARD_FINISH" id="bm_id3153748" localize="false"/>
+<paragraph role="heading" id="hd_id3145071" xml-lang="en-US" level="2" l10n="U" oldref="5">Create</paragraph>
+<paragraph role="paragraph" id="par_id3149811" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_LISTWIZARD_FINISH">Creates the object.</ahelp></paragraph>
+</body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01130000.xhp b/helpcontent2/source/text/shared/autopi/01130000.xhp
index dd7992190a..12227de0d4 100755
--- a/helpcontent2/source/text/shared/autopi/01130000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01130000.xhp
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
@@ -11,7 +11,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: 01130000.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,18 +32,13 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsharedautopi01130000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01130000xml" indexer="include">
 <title id="tit" xml-lang="en-US">Document Converter</title>
 <filename>/text/shared/autopi/01130000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-12-04T15:38:11">converted from old format - fpe
-checked - yj</lastedited>
-</history>
 </meta>
 <body><comment>mw deleted all index entries because of guide import_ms.xhp</comment>
 <paragraph role="paragraph" id="par_id3151097" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
@@ -53,7 +48,7 @@ checked - yj</lastedited>
 <paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="ms"><ahelp hid=".">Copies and converts documents into the OpenDocument XML format used by $[officename].</ahelp>
 </variable></paragraph>
 <section id="howtoget">
-  <embed href="text/shared/00/00000401.xhp#autopilotmsimport"/>
+<embed href="text/shared/00/00000401.xhp#autopilotmsimport"/>
 </section>
 <paragraph role="paragraph" id="par_id3150775" xml-lang="en-US" l10n="U" oldref="3">The wizard converts documents and templates from the binary format from previous $[officename] versions (StarOffice 5.2 and before), as well as documents from Microsoft Word, Excel and PowerPoint. The source files are only read, not edited. New target files are written with the new file name extension in the same or a new folder.</paragraph>
 <paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="4">The Document Converter Wizard contains the following pages:</paragraph>
@@ -61,9 +56,8 @@ checked - yj</lastedited>
 <embed href="text/shared/autopi/01130200.xhp#seite2"/>
 <paragraph role="heading" id="hd_id3154318" xml-lang="en-US" level="2" l10n="U" oldref="7">Document Converter Summary</paragraph>
 <paragraph role="paragraph" id="par_id3145313" xml-lang="en-US" l10n="U" oldref="8">Displays a summary which shows what will be converted when you click <emph>Convert</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDCANCEL" id="bm_id3147653" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDPREV" id="bm_id3156347" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDNEXT" id="bm_id3145382" localize="false"/><embed href="text/shared/autopi/01010000.xhp#zurueck"/>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<embed href="text/shared/autopi/01010000.xhp#zurueck"/>
 <embed href="text/shared/autopi/01010000.xhp#weiter"/>
 <embed href="text/shared/00/00000001.xhp#import"/>
 </body>
diff --git a/helpcontent2/source/text/shared/autopi/01170000.xhp b/helpcontent2/source/text/shared/autopi/01170000.xhp
index 9bf65d6d43..17276999bd 100755
--- a/helpcontent2/source/text/shared/autopi/01170000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170000.xhp
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
@@ -12,7 +11,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: 01170000.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -33,11 +32,10 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsharedautopi01170000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01170000xml" indexer="include">
 <title id="tit" xml-lang="en-US">Address Data Source</title>
 <filename>/text/shared/autopi/01170000.xhp</filename>
 </topic>
@@ -46,45 +44,59 @@
 <section id="adressdatenquelle">
 <bookmark xml-lang="en-US" branch="hid/extensions:TabPage:RID_PAGE_SELECTABTYPE" id="bm_id2237617" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/slot:10934" id="bm_id3581347" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:AutoPilotAddressDataSource" id="bm_id6961272" localize="false"/><paragraph role="heading" id="hd_id3147285" xml-lang="en-US" level="1" l10n="U" oldref="2"><link href="text/shared/autopi/01170000.xhp" name="Address Data Source">Address Data Source</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:AutoPilotAddressDataSource" id="bm_id6961272" localize="false"/>
+<paragraph role="heading" id="hd_id3147285" xml-lang="en-US" level="1" l10n="U" oldref="2"><link href="text/shared/autopi/01170000.xhp" name="Address Data Source">Address Data Source</link></paragraph>
 <paragraph role="paragraph" id="par_id3153910" xml-lang="en-US" l10n="CHG" oldref="3"><ahelp hid=".">This wizard registers an existing address book as a data source in $[officename].</ahelp></paragraph>
 </section>
 <section id="howtoget">
-  <embed href="text/shared/00/00000401.xhp#addressimport1"/>
+<embed href="text/shared/00/00000401.xhp#addressimport1"/>
 </section>
 <paragraph role="paragraph" id="par_id3151226" xml-lang="en-US" l10n="CHG" oldref="4">You can register address data and other data sources in $[officename] at any time:</paragraph>
 <embed href="text/shared/guide/data_addressbook.xhp#data_addressbook"/>
 <paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="2" l10n="U" oldref="9">Please select the type of your external address book</paragraph>
 <paragraph role="paragraph" id="par_id5782036" xml-lang="en-US" l10n="NEW">Not all types are available on all systems.</paragraph>
-<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>
+<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_THUNDERBIRD" id="bm_id611896" localize="false"/><paragraph role="heading" id="hd_id3895382" xml-lang="en-US" level="3" l10n="NEW">Thunderbird</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_THUNDERBIRD" id="bm_id611896" localize="false"/>
+<paragraph role="heading" id="hd_id3895382" xml-lang="en-US" level="3" l10n="NEW">Thunderbird</paragraph>
 <paragraph role="paragraph" id="par_id6709494" 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>
+<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>
-<bookmark xml-lang="en-US" branch="hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOK" id="bm_id3155435" localize="false"/><paragraph role="heading" id="hd_id3152780" xml-lang="en-US" level="3" l10n="CHG" oldref="14">Outlook address book</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOK" id="bm_id3155435" localize="false"/>
+<paragraph role="heading" id="hd_id3152780" xml-lang="en-US" level="3" l10n="CHG" oldref="14">Outlook address book</paragraph>
 <paragraph role="paragraph" id="par_id3159176" xml-lang="en-US" l10n="CHG" oldref="15"><ahelp hid="extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOK">Select this option if you already use an address book in Microsoft Outlook (not Outlook Express).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OUTLOOKEXPRESS" id="bm_id926847" localize="false"/><paragraph role="heading" id="hd_id3154860" xml-lang="en-US" level="3" l10n="CHG" oldref="16">Windows system address book</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OUTLOOKEXPRESS" id="bm_id926847" localize="false"/>
+<paragraph role="heading" id="hd_id3154860" xml-lang="en-US" level="3" l10n="CHG" oldref="16">Windows system address book</paragraph>
 <paragraph role="paragraph" id="par_id3150254" xml-lang="en-US" l10n="CHG" oldref="17"><ahelp hid="extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOKEXPRESS">Select this option if you already use an address book in Microsoft Outlook Express.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_KAB" id="bm_id926848" localize="false"/><paragraph role="heading" id="hd_id9215979" xml-lang="en-US" level="3" l10n="NEW">KDE Address book</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_KAB" id="bm_id926848" localize="false"/>
+<paragraph role="heading" id="hd_id9215979" xml-lang="en-US" level="3" l10n="NEW">KDE Address book</paragraph>
 <paragraph role="paragraph" id="par_id585650" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this option if you already use an address book in KDE Address book.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_MACAB" id="bm_id926849" localize="false"/><paragraph role="heading" id="hd_id4791405" xml-lang="en-US" level="3" l10n="NEW">OS X Address book</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_MACAB" id="bm_id926849" localize="false"/>
+<paragraph role="heading" id="hd_id4791405" xml-lang="en-US" level="3" l10n="NEW">OS X Address book</paragraph>
 <paragraph role="paragraph" id="par_id6873683" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this option if you already use an address book in OS X Address book.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION" id="bm_id827051" localize="false"/><paragraph role="heading" id="hd_id4517654" xml-lang="en-US" level="3" l10n="NEW">Evolution</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION" id="bm_id827051" localize="false"/>
+<paragraph role="heading" id="hd_id4517654" xml-lang="en-US" level="3" l10n="NEW">Evolution</paragraph>
 <paragraph role="paragraph" id="par_id4368724" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this option if you already use an address book in Evolution.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION_LDAP" id="bm_id2706076" localize="false"/><paragraph role="heading" id="hd_id4218268" xml-lang="en-US" level="3" l10n="NEW">Evolution LDAP</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION_LDAP" id="bm_id2706076" localize="false"/>
+<paragraph role="heading" id="hd_id4218268" xml-lang="en-US" level="3" l10n="NEW">Evolution LDAP</paragraph>
 <paragraph role="paragraph" id="par_id6269112" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this option if you already use an address book in Evolution LDAP.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION_GROUPWISE" id="bm_id7849360" localize="false"/><paragraph role="heading" id="hd_id8174382" xml-lang="en-US" level="3" l10n="NEW">Groupwise</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION_GROUPWISE" id="bm_id7849360" localize="false"/>
+<paragraph role="heading" id="hd_id8174382" xml-lang="en-US" level="3" l10n="NEW">Groupwise</paragraph>
 <paragraph role="paragraph" id="par_id5294045" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this option if you already use an address book in Groupwise.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OTHER" id="bm_id9591051" localize="false"/><paragraph role="heading" id="hd_id3150976" xml-lang="en-US" level="3" l10n="U" oldref="18">Other external data source</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OTHER" id="bm_id9591051" 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"/><paragraph role="heading" id="hd_id3145674" xml-lang="en-US" level="2" l10n="U" oldref="21">Cancel</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_CANCEL" id="bm_id3150771" localize="false"/>
+<paragraph role="heading" id="hd_id3145674" xml-lang="en-US" level="2" l10n="U" oldref="21">Cancel</paragraph>
 <paragraph role="paragraph" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="HID_ABSPILOT_CANCEL">Exits the wizard without implementing any changes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_PREVIOUS" id="bm_id3156024" localize="false"/><embed href="text/shared/autopi/01010000.xhp#zurueck"/>
+<embed href="text/shared/autopi/01010000.xhp#zurueck"/>
 <paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="HID_ABSPILOT_PREVIOUS" visibility="hidden">Go to previous step.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_NEXT" id="bm_id3154346" localize="false"/><embed href="text/shared/autopi/01010000.xhp#weiter"/>
+<embed href="text/shared/autopi/01010000.xhp#weiter"/>
 <paragraph role="paragraph" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="HID_ABSPILOT_NEXT" visibility="hidden">Go to next step.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_FINISH" id="bm_id3152812" localize="false"/><paragraph role="heading" id="hd_id3147303" xml-lang="en-US" level="2" l10n="U" oldref="5">Create</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_FINISH" id="bm_id3152812" localize="false"/>
+<paragraph role="heading" id="hd_id3147303" xml-lang="en-US" level="2" l10n="U" oldref="5">Create</paragraph>
 <paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_ABSPILOT_FINISH">Establishes the connection to the data source and closes the dialog.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/makefile.mk b/helpcontent2/source/text/shared/autopi/makefile.mk
index 383d0e376c..c0c61ff588 100644
--- a/helpcontent2/source/text/shared/autopi/makefile.mk
+++ b/helpcontent2/source/text/shared/autopi/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/helpcontent2/source/text/shared/autopi/startup.xhp b/helpcontent2/source/text/shared/autopi/startup.xhp
index c9e138d2e3..579af0f79b 100644
--- a/helpcontent2/source/text/shared/autopi/startup.xhp
+++ b/helpcontent2/source/text/shared/autopi/startup.xhp
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
@@ -12,7 +11,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: startup.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -33,11 +32,10 @@
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsharedautopistartupxhp" indexer="include" status="PUBLISH">
+<topic id="textsharedautopistartupxhp" indexer="include">
 <title id="tit" xml-lang="en-US">Start-up Wizard</title>
 <filename>/text/shared/autopi/startup.xhp</filename>
 </topic>
@@ -47,17 +45,21 @@
 <paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW">The Start-up Wizard opens when you start %PRODUCTNAME for the first time.</paragraph>
 <paragraph role="paragraph" id="par_idN1055F" xml-lang="en-US" l10n="NEW">The wizard consists of the following pages:</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_WELCOME" id="bm_id8871120" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_DIALOG" id="bm_id3778496" localize="false"/><paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="2" l10n="NEW">Welcome</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_DIALOG" id="bm_id3778496" localize="false"/>
+<paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="2" l10n="NEW">Welcome</paragraph>
 <paragraph role="paragraph" id="par_idN10566" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Start-up Wizard helps you to specify the user settings for %PRODUCTNAME. This wizard only runs once.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_LICENSE" id="bm_id9530930" localize="false"/><paragraph role="heading" id="par_idN10575" xml-lang="en-US" level="2" l10n="NEW">License</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_LICENSE" id="bm_id9530930" localize="false"/>
+<paragraph role="heading" id="par_idN10575" xml-lang="en-US" level="2" l10n="NEW">License</paragraph>
 <paragraph role="paragraph" id="par_idN10579" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Read and accept the license text to continue. You need to scroll to the end of the license text before you can continue. If you decline the license, the installation is canceled.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_MIGRATION" id="bm_id4303415" localize="false"/><paragraph role="heading" id="par_idN10588" xml-lang="en-US" level="2" l10n="NEW">Migration</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_MIGRATION" id="bm_id4303415" localize="false"/>
+<paragraph role="heading" id="par_idN10588" xml-lang="en-US" level="2" l10n="NEW">Migration</paragraph>
 <paragraph role="paragraph" id="par_idN1058C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">You can use this page to import user data from a previously installed version of %PRODUCTNAME.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN1059F" xml-lang="en-US" level="3" l10n="NEW">Copy personal data</paragraph>
 <paragraph role="paragraph" id="par_idN105A3" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Copies the user name and other data from a previous %PRODUCTNAME installation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_USER" id="bm_id9908444" localize="false"/><paragraph role="heading" id="par_idN105B2" xml-lang="en-US" level="2" l10n="NEW">User name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_USER" id="bm_id9908444" localize="false"/>
+<paragraph role="heading" id="par_idN105B2" xml-lang="en-US" level="2" l10n="NEW">User name</paragraph>
 <paragraph role="paragraph" id="par_idN105B6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The user name is used for the document properties, templates, and when you record changes made to documents. This page is only displayed if a previous installation of %PRODUCTNAME is not found on your computer.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN105C8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter your personal data into the text boxes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_REGISTRATION" id="bm_id2025818" localize="false"/><embed href="text/shared/01/08060100.xhp#registrierung"/>
+<embed href="text/shared/01/08060100.xhp#registrierung"/>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/webwizard00.xhp b/helpcontent2/source/text/shared/autopi/webwizard00.xhp
index 4033473bfa..92c2ab8f74 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard00.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard00.xhp
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+	
 <!--
- ***********************************************************************
+***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
@@ -11,7 +11,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: webwizard00.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,17 +32,13 @@
  *
  ************************************************************************
  -->
+ 
 	
-<helpdocument version="1.0">
 <meta>
-<topic id="textsharedautopiwebwizard00xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopiwebwizard00xml" indexer="include">
 <title id="tit" xml-lang="en-US">Web Wizard</title>
 <filename>/text/shared/autopi/webwizard00.xhp</filename>
 </topic>
-<history>
-<created date="2004-07-13T13:06:46">UFI: Web Wizard main page</created>
-<lastedited date="2006-02-24T11:06:34">dedr: reviewed</lastedited>
-</history>
 </meta>
 <body>
 <section id="webwizard">
@@ -52,7 +48,7 @@
 <paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="NEW"><ahelp hid="34200">The Web Wizard helps you to maintain a web site on an Internet server.</ahelp>The Web Wizard converts files in a local folder to a web format and uploads the files to the server. The wizard also uses one of the supplied templates to create an index page that contains hyperlinks to the uploaded files.</paragraph>
 </section>
 <section id="howtoget">
-  <embed href="text/shared/00/00000401.xhp#webwizard"/>
+<embed href="text/shared/00/00000401.xhp#webwizard"/>
 </section>
 <paragraph role="note" id="par_idN105C4" xml-lang="en-US" l10n="NEW">The Web Wizard uses the File Transfer Protocol (FTP) to upload files to a server. You cannot use the wizard to upload the files if you connect to the internet through a proxy server.</paragraph>
 <paragraph role="paragraph" id="par_idN10574" xml-lang="en-US" l10n="NEW">The wizard involves the following steps:</paragraph>
@@ -63,8 +59,8 @@
 <embed href="text/shared/autopi/webwizard05.xhp#design"/>
 <embed href="text/shared/autopi/webwizard06.xhp#websiteinfo"/>
 <embed href="text/shared/autopi/webwizard07.xhp#preview"/>
-<bookmark xml-lang="en-US" branch="hid/HID0_CANCEL" id="bm_id7899105" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
-<bookmark xml-lang="en-US" branch="hid/HID0_PREV" id="bm_id1207617" localize="false"/><embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
-<bookmark xml-lang="en-US" branch="hid/HID0_NEXT" id="bm_id480666" localize="false"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/><comment>UFI: removed some form help ids</comment>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+<embed href="text/shared/00/00000001.xhp#weiterautopi"/>
 </body>
 </helpdocument>